Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: pkg/compiler/lib/src/universe/resolution_world_builder.dart

Issue 2975433002: Assert that we don't mix K and J elements (Closed)
Patch Set: Updated cf. comments Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/universe/resolution_world_builder.dart
diff --git a/pkg/compiler/lib/src/universe/resolution_world_builder.dart b/pkg/compiler/lib/src/universe/resolution_world_builder.dart
index b4a6f854ab0c0945330965648ba2609c378286a6..2f2ba48da25ceb6d136b66e31dcd67b413bee1e6 100644
--- a/pkg/compiler/lib/src/universe/resolution_world_builder.dart
+++ b/pkg/compiler/lib/src/universe/resolution_world_builder.dart
@@ -336,6 +336,7 @@ abstract class ResolutionWorldBuilderBase
final Set<FunctionEntity> closurizedMembersWithFreeTypeVariables =
new Set<FunctionEntity>();
+ final CompilerOptions _options;
final ElementEnvironment _elementEnvironment;
final DartTypes _dartTypes;
final CommonElements _commonElements;
@@ -345,6 +346,8 @@ abstract class ResolutionWorldBuilderBase
final NativeDataBuilder _nativeDataBuilder;
final InterceptorDataBuilder _interceptorDataBuilder;
final BackendUsageBuilder _backendUsageBuilder;
+ final RuntimeTypesNeedBuilder _rtiNeedBuilder;
+ final NativeResolutionEnqueuer _nativeResolutionEnqueuer;
final SelectorConstraintsStrategy selectorConstraintsStrategy;
@@ -372,6 +375,7 @@ abstract class ResolutionWorldBuilderBase
bool get isClosed => _closed;
ResolutionWorldBuilderBase(
+ this._options,
this._elementEnvironment,
this._dartTypes,
this._commonElements,
@@ -380,6 +384,8 @@ abstract class ResolutionWorldBuilderBase
this._nativeDataBuilder,
this._interceptorDataBuilder,
this._backendUsageBuilder,
+ this._rtiNeedBuilder,
+ this._nativeResolutionEnqueuer,
this.selectorConstraintsStrategy);
Iterable<ClassEntity> get processedClasses => _processedClasses.keys
@@ -946,6 +952,7 @@ abstract class KernelResolutionWorldBuilderBase
KernelToElementMapForImpactImpl get elementMap;
KernelResolutionWorldBuilderBase(
+ CompilerOptions options,
ElementEnvironment elementEnvironment,
DartTypes dartTypes,
CommonElements commonElements,
@@ -954,8 +961,11 @@ abstract class KernelResolutionWorldBuilderBase
NativeDataBuilder nativeDataBuilder,
InterceptorDataBuilder interceptorDataBuilder,
BackendUsageBuilder backendUsageBuilder,
+ RuntimeTypesNeedBuilder rtiNeedBuilder,
+ NativeResolutionEnqueuer nativeResolutionEnqueuer,
SelectorConstraintsStrategy selectorConstraintsStrategy)
: super(
+ options,
elementEnvironment,
dartTypes,
commonElements,
@@ -964,6 +974,8 @@ abstract class KernelResolutionWorldBuilderBase
nativeDataBuilder,
interceptorDataBuilder,
backendUsageBuilder,
+ rtiNeedBuilder,
+ nativeResolutionEnqueuer,
selectorConstraintsStrategy);
@override
@@ -977,14 +989,18 @@ abstract class KernelResolutionWorldBuilderBase
"ClassHierarchyNode/ClassSet mismatch: "
"$_classHierarchyNodes vs $_classSets");
return _closedWorldCache = new KernelClosedWorld(elementMap,
+ options: _options,
elementEnvironment: _elementEnvironment,
dartTypes: _dartTypes,
commonElements: _commonElements,
nativeData: _nativeDataBuilder.close(),
interceptorData: _interceptorDataBuilder.close(),
backendUsage: _backendUsageBuilder.close(),
+ resolutionWorldBuilder: this,
+ rtiNeedBuilder: _rtiNeedBuilder,
constantSystem: _constantSystem,
implementedClasses: _implementedClasses,
+ liveNativeClasses: _nativeResolutionEnqueuer.liveNativeClasses,
liveInstanceMembers: _liveInstanceMembers,
assignedInstanceMembers: computeAssignedInstanceMembers(),
allTypedefs: _allTypedefs,
« no previous file with comments | « pkg/compiler/lib/src/universe/element_world_builder.dart ('k') | pkg/compiler/lib/src/universe/world_builder.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698