Index: sdk/lib/_internal/compiler/implementation/compiler.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/compiler.dart b/sdk/lib/_internal/compiler/implementation/compiler.dart |
index 774c2c6ea2ee79119c8b246b669bb2a8f42aed93..4d1a137e25acef95b3d44b3d06e52278209a90fe 100644 |
--- a/sdk/lib/_internal/compiler/implementation/compiler.dart |
+++ b/sdk/lib/_internal/compiler/implementation/compiler.dart |
@@ -110,7 +110,6 @@ abstract class Compiler implements DiagnosticListener { |
CompilerTask measuredTask; |
Element _currentElement; |
LibraryElement coreLibrary; |
- LibraryElement coreImplLibrary; |
LibraryElement isolateLibrary; |
LibraryElement jsHelperLibrary; |
LibraryElement interceptorsLibrary; |
@@ -376,8 +375,8 @@ abstract class Compiler implements DiagnosticListener { |
void onLibraryScanned(LibraryElement library, Uri uri) { |
if (dynamicClass != null) { |
// When loading the built-in libraries, dynamicClass is null. We |
- // take advantage of this as core and coreimpl import js_helper |
- // and see Dynamic this way. |
+ // take advantage of this as core import js_helper and see Dynamic this |
floitsch
2012/11/12 16:31:56
"imports" "sees" "[dynamic]".
Anders Johnsen
2012/11/12 16:58:38
Done.
|
+ // way. |
withCurrentElement(dynamicClass, () { |
library.addToScope(dynamicClass, this); |
}); |
@@ -418,15 +417,13 @@ abstract class Compiler implements DiagnosticListener { |
} |
void scanBuiltinLibraries() { |
- loadCoreImplLibrary(); |
jsHelperLibrary = scanBuiltinLibrary('_js_helper'); |
interceptorsLibrary = scanBuiltinLibrary('_interceptors'); |
- // The core and coreimpl libraries were loaded and patched before |
- // jsHelperLibrary was initialized, so it wasn't imported into those |
- // two libraries during patching. |
+ // The core library were loaded and patched before jsHelperLibrary was |
floitsch
2012/11/12 16:31:56
was
Anders Johnsen
2012/11/12 16:58:38
Done.
|
+ // initialized, so it wasn't imported into those two libraries during |
+ // patching. |
importHelperLibrary(coreLibrary); |
- importHelperLibrary(coreImplLibrary); |
importHelperLibrary(interceptorsLibrary); |
addForeignFunctions(jsHelperLibrary); |
@@ -445,11 +442,6 @@ abstract class Compiler implements DiagnosticListener { |
const SourceString('invokeOn')); |
} |
- void loadCoreImplLibrary() { |
- Uri coreImplUri = new Uri.fromComponents(scheme: 'dart', path: 'coreimpl'); |
- coreImplLibrary = libraryLoader.loadLibrary(coreImplUri, null, coreImplUri); |
- } |
- |
void importHelperLibrary(LibraryElement library) { |
if (jsHelperLibrary != null) { |
libraryLoader.importLibrary(library, jsHelperLibrary, null); |