Index: pkg/compiler/lib/src/world.dart |
diff --git a/pkg/compiler/lib/src/world.dart b/pkg/compiler/lib/src/world.dart |
index 2ddfbd885a141cf38591c7aa1cf277bce634c6a3..41ceb0f41c2491b2e55756c4f2c8cf21e838a382 100644 |
--- a/pkg/compiler/lib/src/world.dart |
+++ b/pkg/compiler/lib/src/world.dart |
@@ -8,7 +8,7 @@ import 'cache_strategy.dart'; |
import 'closure.dart' show SynthesizedCallMethodElementX; |
import 'common/backend_api.dart' show BackendClasses; |
import 'common.dart'; |
-import 'core_types.dart' show CoreClasses; |
+import 'core_types.dart' show CoreClasses, CommonElements; |
import 'dart_types.dart'; |
import 'elements/elements.dart' |
show |
@@ -47,6 +47,8 @@ abstract class ClosedWorld implements World { |
/// Access to core classes used in the Dart language. |
CoreClasses get coreClasses; |
+ CommonElements get commonElements; |
+ |
CommonMasks get commonMasks; |
/// Returns `true` if [cls] is either directly or indirectly instantiated. |
@@ -874,7 +876,7 @@ class WorldImpl implements ClosedWorld, ClosedWorldRefiner, OpenWorld { |
CommonMasks _commonMasks; |
- final CoreClasses coreClasses; |
+ final CommonElements commonElements; |
final CacheStrategy cacheStrategy; |
@@ -886,7 +888,7 @@ class WorldImpl implements ClosedWorld, ClosedWorldRefiner, OpenWorld { |
return _typesImplementedBySubclasses[cls.declaration]; |
} |
- WorldImpl(this.resolverWorld, this._backend, this.coreClasses, |
+ WorldImpl(this.resolverWorld, this._backend, this.commonElements, |
CacheStrategy cacheStrategy) |
: this.cacheStrategy = cacheStrategy, |
alreadyPopulated = cacheStrategy.newSet() { |
@@ -900,6 +902,8 @@ class WorldImpl implements ClosedWorld, ClosedWorldRefiner, OpenWorld { |
return _commonMasks; |
} |
+ CoreClasses get coreClasses => commonElements; |
+ |
/// Called to add [cls] to the set of known classes. |
/// |
/// This ensures that class hierarchy queries can be performed on [cls] and |