languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-05 18:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move TypeProvider creation into KernelResynthesizer and create loadLibrary functions.

Browse source 
R=brianwilkerson@google.com, paulberry@google.com

Bug:
Change-Id: Idabf9baa72de55d9a501a9b91317aad004dcf5dc
Reviewed-on: https://dart-review.googlesource.com/7447
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Konstantin Shcheglov 2017-09-20 20:48:50 +00:00
parent 2a58b64937
commit c59eaf1788
3 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/analyzer/lib/src/dart/analysis/kernel_context.dart
View file

@ -152,20 +152,9 @@ class KernelContext {
var resynthesizer = new KernelResynthesizer(
analysisContext, kernelResult.types, libraryMap);
analysisContext.typeProvider = _buildTypeProvider(resynthesizer);
return new KernelContext._(analysisContext, resynthesizer);
});
}
static SummaryTypeProvider _buildTypeProvider(
KernelResynthesizer resynthesizer) {
var coreLibrary = resynthesizer.getLibrary('dart:core');
var asyncLibrary = resynthesizer.getLibrary('dart:async');
SummaryTypeProvider summaryTypeProvider = new SummaryTypeProvider();
summaryTypeProvider.initializeCore(coreLibrary);
summaryTypeProvider.initializeAsync(asyncLibrary);
return summaryTypeProvider;
}
}
class _FileSystemAdaptor implements FileSystem {

28
pkg/analyzer/lib/src/kernel/resynthesize.dart
View file

@ -7,11 +7,13 @@ import 'package:analyzer/dart/ast/standard_ast_factory.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/context/context.dart' show AnalysisContextImpl;
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/handle.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
import 'package:analyzer/src/generated/testing/ast_test_factory.dart';
import 'package:analyzer/src/summary/summary_sdk.dart';
import 'package:front_end/src/base/source.dart';
import 'package:front_end/src/fasta/kernel/redirecting_factory_body.dart';
import 'package:kernel/kernel.dart' as kernel;
@ -21,7 +23,7 @@ import 'package:kernel/type_environment.dart' as kernel;
* Object that can resynthesize analyzer [LibraryElement] from Kernel.
*/
class KernelResynthesizer implements ElementResynthesizer {
final AnalysisContext _analysisContext;
final AnalysisContextImpl _analysisContext;
final kernel.TypeEnvironment _types;
final Map<String, kernel.Library> _kernelMap;
final Map<String, LibraryElementImpl> _libraryMap = {};
@ -31,7 +33,13 @@ class KernelResynthesizer implements ElementResynthesizer {
*/
final Map<String, Source> _sources = <String, Source>{};
KernelResynthesizer(this._analysisContext, this._types, this._kernelMap);
/// The type provider for this resynthesizer.
SummaryTypeProvider _typeProvider;
KernelResynthesizer(this._analysisContext, this._types, this._kernelMap) {
_buildTypeProvider();
_analysisContext.typeProvider = _typeProvider;
}
@override
AnalysisContext get context => _analysisContext;
@ -81,10 +89,26 @@ class KernelResynthesizer implements ElementResynthesizer {
}
libraryElement.parts = parts;
// Create the required `loadLibrary` function.
if (uriStr != 'dart:core' && uriStr != 'dart:async') {
libraryElement.createLoadLibraryFunction(_typeProvider);
}
return libraryElement;
});
}
void _buildTypeProvider() {
var coreLibrary = getLibrary('dart:core');
var asyncLibrary = getLibrary('dart:async');
_typeProvider = new SummaryTypeProvider();
_typeProvider.initializeCore(coreLibrary);
_typeProvider.initializeAsync(asyncLibrary);
// Now, when TypeProvider is ready, we can finalize core/async.
coreLibrary.createLoadLibraryFunction(_typeProvider);
asyncLibrary.createLoadLibraryFunction(_typeProvider);
}
/**
* Return the [ElementImpl] that corresponds to the given [name], or `null`
* if the corresponding element cannot be found.

7
pkg/analyzer/test/generated/non_error_resolver_kernel_test.dart
View file

@ -124,13 +124,6 @@ class NonErrorResolverTest_Kernel extends NonErrorResolverTest_Driver {
.test_invalidAnnotation_constantVariable_field_importWithPrefix();
}
@override
@failingTest
test_loadLibraryDefined() async {
fail('This test fails only in checked mode.');
return super.test_loadLibraryDefined();
}
@override
@failingTest
test_memberWithClassName_setter() async {