Index: pkg/compiler/lib/src/deferred_load.dart |
diff --git a/pkg/compiler/lib/src/deferred_load.dart b/pkg/compiler/lib/src/deferred_load.dart |
index 723bd9fed4e16ba595770749ace1fbdb9bd4ad31..114bdcaaf8886442f87a8fc3b0fd7dbe63de1948 100644 |
--- a/pkg/compiler/lib/src/deferred_load.dart |
+++ b/pkg/compiler/lib/src/deferred_load.dart |
@@ -89,7 +89,8 @@ class DeferredLoadTask extends CompilerTask { |
String get name => 'Deferred Loading'; |
/// DeferredLibrary from dart:async |
- ClassElement get deferredLibraryClass => compiler.deferredLibraryClass; |
+ ClassElement get deferredLibraryClass => |
+ compiler.commonElements.deferredLibraryClass; |
/// A synthetic import representing the loading of the main program. |
final _DeferredImport _fakeMainImport = const _DeferredImport(); |
@@ -463,7 +464,7 @@ class DeferredLoadTask extends CompilerTask { |
} |
traverseLibrary(root); |
- result.add(compiler.coreLibrary); |
+ result.add(compiler.commonElements.coreLibrary); |
return result; |
} |
@@ -668,7 +669,7 @@ class DeferredLoadTask extends CompilerTask { |
// Now check to see if we have to add more elements due to |
// mirrors. |
- if (compiler.mirrorsLibrary != null) { |
+ if (compiler.commonElements.mirrorsLibrary != null) { |
_addMirrorElements(); |
} |
@@ -1021,7 +1022,7 @@ class _DeclaredDeferredImport implements _DeferredImport { |
ConstantValue value = |
compiler.constants.getConstantValue(metadata.constant); |
Element element = value.getType(compiler.coreTypes).element; |
- if (element == compiler.deferredLibraryClass) { |
+ if (element == compiler.commonElements.deferredLibraryClass) { |
ConstructedConstantValue constant = value; |
StringConstantValue s = constant.fields.values.single; |
result = s.primitiveValue.slowToString(); |