Introduce "CommonElements"

tests/compiler/dart2js/patch_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/diagnostics/messages.dart' show
     MessageKind;
@@ skipping 112 matching lines @@
     }
   }
   Expect.isFalse(element.isPatched && element.isPatch);
   return element;
 }
 
 Future testPatchFunction() async {
   var compiler = await applyPatch(
       "external test();",
       "@patch test() { return 'string'; } ");
-  ensure(compiler, "test", compiler.coreLibrary.find,
+  ensure(compiler, "test", compiler.commonElements.coreLibrary.find,
          expectIsPatched: true, checkHasBody: true);
-  ensure(compiler, "test", compiler.coreLibrary.patch.find,
+  ensure(compiler, "test", compiler.commonElements.coreLibrary.patch.find,
          expectIsPatch: true, checkHasBody: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(collector.errors.isEmpty,
                 "Unexpected errors: ${collector.errors}");
 }
 
 Future testPatchFunctionMetadata() async {
   var compiler = await applyPatch(
       """
       const a = 0;
       @a external test();
       """,
       """
       const _b = 1;
       @patch @_b test() {}
       """);
-  Element origin = ensure(compiler, "test", compiler.coreLibrary.find,
-         expectIsPatched: true, checkHasBody: true);
-  Element patch = ensure(compiler, "test", compiler.coreLibrary.patch.find,
-         expectIsPatch: true, checkHasBody: true);
+  Element origin = ensure(compiler, "test",
+      compiler.commonElements.coreLibrary.find,
+      expectIsPatched: true, checkHasBody: true);
+  Element patch = ensure(compiler, "test",
+      compiler.commonElements.coreLibrary.patch.find,
+      expectIsPatch: true, checkHasBody: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(collector.errors.isEmpty,
                 "Unexpected errors: ${collector.errors}");
 
   Expect.equals(1, origin.metadata.length,
                 "Unexpected origin metadata: ${origin.metadata}.");
   Expect.equals(3, patch.metadata.length,
@@ skipping 17 matching lines @@
         String expectedError,
         String defaultPatch: '',
         String expectedInternalError}) async {
     return applyPatch(
         "external test();",
         """
         $defaultPatch
         $patchSource
         """,
         patchVersion: patchVersion).then((compiler) {
-        Element origin =
-            ensure(compiler, "test", compiler.coreLibrary.find,
-                 expectIsPatched: expectIsPatched, checkHasBody: true);
+        Element origin = ensure(compiler, "test",
+            compiler.commonElements.coreLibrary.find,
+            expectIsPatched: expectIsPatched, checkHasBody: true);
         if (expectIsPatched) {
-          AstElement patch =
-              ensure(compiler, "test", compiler.coreLibrary.patch.find,
-                  expectIsPatch: true, checkHasBody: true);
+          AstElement patch = ensure(compiler, "test",
+              compiler.commonElements.coreLibrary.patch.find,
+              expectIsPatch: true, checkHasBody: true);
           Expect.equals(origin.patch, patch);
           Expect.equals(patch.origin, origin);
           Expect.equals(patchText, patch.node.toString());
         }
 
         compiler.analyzeElement(origin);
         compiler.enqueuer.resolution.emptyDeferredQueueForTesting();
 
         DiagnosticCollector collector = compiler.diagnosticCollector;
         Expect.isTrue(collector.warnings.isEmpty,
@@ skipping 29 matching lines @@
       """
       class Class {
         external Class();
       }
       """,
       """
       @patch class Class {
         @patch Class();
       }
       """);
-  var classOrigin = ensure(compiler, "Class", compiler.coreLibrary.find,
-                           expectIsPatched: true);
+  var classOrigin = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   classOrigin.ensureResolved(compiler.resolution);
-  var classPatch = ensure(compiler, "Class", compiler.coreLibrary.patch.find,
-                          expectIsPatch: true);
+  var classPatch = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.patch.find, expectIsPatch: true);
 
   Expect.equals(classPatch, classOrigin.patch);
   Expect.equals(classOrigin, classPatch.origin);
 
   var constructorOrigin = ensure(compiler, "",
                                  (name) => classOrigin.localLookup(name),
                                  expectIsPatched: true);
   var constructorPatch = ensure(compiler, "",
                                 (name) => classPatch.localLookup(name),
                                 expectIsPatch: true);
@@ skipping 15 matching lines @@
         Class(x) : this._(x, false);
 
         external Class._(x, y);
       }
       """,
       r"""
       @patch class Class {
         @patch Class._(x, y) { print('$x,$y'); }
       }
       """);
-  var classOrigin = ensure(compiler, "Class", compiler.coreLibrary.find,
-                           expectIsPatched: true);
+  var classOrigin = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   classOrigin.ensureResolved(compiler.resolution);
 
-  var classPatch = ensure(compiler, "Class", compiler.coreLibrary.patch.find,
-                          expectIsPatch: true);
+  var classPatch = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.patch.find, expectIsPatch: true);
 
   Expect.equals(classOrigin, classPatch.origin);
   Expect.equals(classPatch, classOrigin.patch);
 
   var constructorRedirecting =
       ensure(compiler, "",
              (name) => classOrigin.localLookup(name));
   var constructorOrigin =
       ensure(compiler, "_",
              (name) => classOrigin.localLookup(name),
@@ skipping 19 matching lines @@
       """
       class Class {
         external String toString();
       }
       """,
       """
       @patch class Class {
         @patch String toString() => 'string';
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
-  ensure(compiler, "Class", compiler.coreLibrary.patch.find,
+  ensure(compiler, "Class", compiler.commonElements.coreLibrary.patch.find,
          expectIsPatch: true);
 
   ensure(compiler, "toString", container.lookupLocalMember,
          expectIsPatched: true, checkHasBody: true);
   ensure(compiler, "toString", container.patch.lookupLocalMember,
          expectIsPatch: true, checkHasBody: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(collector.errors.isEmpty,
                 "Unexpected errors: ${collector.errors}");
 }
 
 Future testPatchGetter() async {
   var compiler = await applyPatch(
       """
       class Class {
         external int get field;
       }
       """,
       """
       @patch class Class {
         @patch int get field => 5;
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
   ensure(compiler,
          "field",
          container.lookupLocalMember,
          expectIsGetter: true,
          expectIsPatched: true,
          checkHasBody: true);
   ensure(compiler,
          "field",
          container.patch.lookupLocalMember,
@@ skipping 12 matching lines @@
   var compiler = await applyPatch(
       """
       class Class {
         void regular() {}
       }
       """,
       """
       @patch class Class {
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
-  ensure(compiler, "Class", compiler.coreLibrary.patch.find,
+  ensure(compiler, "Class", compiler.commonElements.coreLibrary.patch.find,
          expectIsPatch: true);
 
   ensure(compiler, "regular", container.lookupLocalMember,
          checkHasBody: true, expectIsRegular: true);
   ensure(compiler, "regular", container.patch.lookupLocalMember,
          checkHasBody: true, expectIsRegular: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(collector.errors.isEmpty,
                 "Unexpected errors: ${collector.errors}");
 }
 
 Future testInjectedMember() async {
   var compiler = await applyPatch(
       """
       class Class {
       }
       """,
       """
       @patch class Class {
         void _injected() {}
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
-  ensure(compiler, "Class", compiler.coreLibrary.patch.find,
+  ensure(compiler, "Class", compiler.commonElements.coreLibrary.patch.find,
          expectIsPatch: true);
 
   ensure(compiler, "_injected", container.lookupLocalMember,
          expectIsFound: false);
   ensure(compiler, "_injected", container.patch.lookupLocalMember,
          checkHasBody: true, expectIsRegular: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(collector.errors.isEmpty,
                 "Unexpected errors: ${collector.errors}");
 }
 
 Future testInjectedPublicMember() async {
   var compiler = await applyPatch(
       """
       class Class {
       }
       """,
       """
       @patch class Class {
         void injected() {}
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
-  ensure(compiler, "Class", compiler.coreLibrary.patch.find,
+  ensure(compiler, "Class", compiler.commonElements.coreLibrary.patch.find,
          expectIsPatch: true);
 
   ensure(compiler, "injected", container.lookupLocalMember,
          expectIsFound: false);
   ensure(compiler, "injected", container.patch.lookupLocalMember,
          checkHasBody: true, expectIsRegular: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.equals(1, collector.errors.length,
                 "Unexpected errors: ${collector.errors}");
   Expect.isTrue(
       collector.errors.first.message.kind ==
           MessageKind.INJECTED_PUBLIC_MEMBER);
 }
 
 Future testInjectedFunction() async {
   var compiler = await applyPatch(
       "",
       "int _function() => 5;");
   ensure(compiler,
          "_function",
-         compiler.coreLibrary.find,
+         compiler.commonElements.coreLibrary.find,
          expectIsFound: false);
   ensure(compiler,
          "_function",
-         compiler.coreLibrary.patch.find,
+         compiler.commonElements.coreLibrary.patch.find,
          checkHasBody: true, expectIsRegular: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(collector.errors.isEmpty,
                 "Unexpected errors: ${collector.errors}");
 }
 
 Future testInjectedPublicFunction() async {
   var compiler = await applyPatch(
       "",
       "int function() => 5;");
   ensure(compiler,
          "function",
-         compiler.coreLibrary.find,
+         compiler.commonElements.coreLibrary.find,
          expectIsFound: false);
   ensure(compiler,
          "function",
-         compiler.coreLibrary.patch.find,
+         compiler.commonElements.coreLibrary.patch.find,
          checkHasBody: true, expectIsRegular: true);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   Expect.equals(1, collector.errors.length,
                 "Unexpected errors: ${collector.errors}");
   Expect.isTrue(
       collector.errors.first.message.kind ==
           MessageKind.INJECTED_PUBLIC_MEMBER);
@@ skipping 24 matching lines @@
         @patch void method4([String str, int i]) {}
         @patch void method5() {}
         @patch void method6([String str]) {}
         @patch void method7([String s2]) {}
         @patch void method8({String s2}) {}
         @patch void method9(int str) {}
         @patch void method10([int str]) {}
         @patch void method11({int str}) {}
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.ensureResolved(compiler.resolution);
   container.parseNode(compiler.parsingContext);
   DiagnosticCollector collector = compiler.diagnosticCollector;
 
   void expect(String methodName, List infos, List errors) {
     collector.clear();
     compiler.resolver.resolveMethodElement(
         ensure(compiler, methodName, container.lookupLocalMember,
             expectIsPatched: true, checkHasBody: true));
     Expect.equals(0, collector.warnings.length);
@@ skipping 33 matching lines @@
 }
 
 Future testExternalWithoutImplementationTopLevel() async {
   var compiler = await applyPatch(
       """
       external void foo();
       """,
       """
       // @patch void foo() {}
       """);
-  var function = ensure(compiler, "foo", compiler.coreLibrary.find);
+  var function = ensure(compiler, "foo",
+      compiler.commonElements.coreLibrary.find);
   compiler.resolver.resolve(function);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   print('testExternalWithoutImplementationTopLevel:${collector.errors}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind ==
           MessageKind.PATCH_EXTERNAL_WITHOUT_IMPLEMENTATION);
   Expect.stringEquals('External method without an implementation.',
                       collector.errors.first.message.toString());
 }
 
 Future testExternalWithoutImplementationMember() async {
   var compiler = await applyPatch(
       """
       class Class {
         external void foo();
       }
       """,
       """
       @patch class Class {
         // @patch void foo() {}
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   collector.clear();
   compiler.resolver.resolveMethodElement(
       ensure(compiler, "foo", container.lookupLocalMember));
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   print('testExternalWithoutImplementationMember:${collector.errors}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind ==
           MessageKind.PATCH_EXTERNAL_WITHOUT_IMPLEMENTATION);
   Expect.stringEquals('External method without an implementation.',
                       collector.errors.first.message.toString());
 }
 
 Future testIsSubclass() async {
   var compiler = await applyPatch(
       """
       class A {}
       """,
       """
       @patch class A {}
       """);
-  ClassElement cls = ensure(compiler, "A", compiler.coreLibrary.find,
-                            expectIsPatched: true);
+  ClassElement cls = ensure(compiler, "A",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   ClassElement patch = cls.patch;
   Expect.isTrue(cls != patch);
   Expect.isTrue(cls.isSubclassOf(patch));
   Expect.isTrue(patch.isSubclassOf(cls));
 }
 
 Future testPatchNonExistingTopLevel() async {
   var compiler = await applyPatch(
       """
       // class Class {}
@@ skipping 13 matching lines @@
 Future testPatchNonExistingMember() async {
   var compiler = await applyPatch(
       """
       class Class {}
       """,
       """
       @patch class Class {
         @patch void foo() {}
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
   DiagnosticCollector collector = compiler.diagnosticCollector;
 
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   print('testPatchNonExistingMember:${collector.errors}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NON_EXISTING);
 }
 
 Future testPatchNonPatchablePatch() async {
   var compiler = await applyPatch(
       """
       external get foo;
       """,
       """
       @patch var foo;
       """);
-  ensure(compiler, "foo", compiler.coreLibrary.find);
+  ensure(compiler, "foo", compiler.commonElements.coreLibrary.find);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   print('testPatchNonPatchablePatch:${collector.errors}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NONPATCHABLE);
 }
 
 Future testPatchNonPatchableOrigin() async {
   var compiler = await applyPatch(
       """
       external var foo;
       """,
       """
       @patch get foo => 0;
       """);
-  ensure(compiler, "foo", compiler.coreLibrary.find);
+  ensure(compiler, "foo", compiler.commonElements.coreLibrary.find);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(collector.warnings.isEmpty,
                 "Unexpected warnings: ${collector.warnings}");
   print('testPatchNonPatchableOrigin:${collector.errors}');
   Expect.equals(2, collector.errors.length);
   Expect.equals(
       MessageKind.EXTRANEOUS_MODIFIER, collector.errors.first.message.kind);
   Expect.equals(
       // TODO(ahe): Eventually, this error should be removed as it will be
@@ skipping 27 matching lines @@
       """
       class Class {
         void foo() {}
       }
       """,
       """
       @patch class Class {
         @patch void foo() {}
       }
       """);
-  var container = ensure(compiler, "Class", compiler.coreLibrary.find,
-                         expectIsPatched: true);
+  var container = ensure(compiler, "Class",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonExternalMember.errors:${collector.errors}');
   print('testPatchNonExternalMember.warnings:${collector.warnings}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NON_EXTERNAL);
   Expect.equals(0, collector.warnings.length);
   Expect.equals(1, collector.infos.length);
@@ skipping 140 matching lines @@
       main: """
       main () {
         new A(); // ensure A and B are instantiated
         new B();
       }
       """,
       runCompiler: true, analyzeOnly: true);
   World world = compiler.world;
   world.populate();
 
-  ClassElement cls = ensure(compiler, "A", compiler.coreLibrary.find,
-                            expectIsPatched: true);
+  ClassElement cls = ensure(compiler, "A",
+      compiler.commonElements.coreLibrary.find, expectIsPatched: true);
   cls.ensureResolved(compiler.resolution);
 
   ensure(compiler, "method", cls.patch.lookupLocalMember,
          checkHasBody: true, expectIsRegular: true);
 
   ensure(compiler, "clear", cls.lookupLocalMember,
          checkHasBody: true, expectIsPatched: true);
 
   compiler.phase = Compiler.PHASE_DONE_RESOLVING;
 
@@ skipping 12 matching lines @@
   selector =
       new Selector.call(const PublicName('clear'), CallStructure.NO_ARGS);
   typeMask = new TypeMask.exact(cls, world);
   method = cls.lookupLocalMember('clear');
   method.computeType(compiler.resolution);
   Expect.isTrue(selector.applies(method, world));
   Expect.isTrue(typeMask.canHit(method, selector, world));
 
   // Check that the declaration method in the declaration class is a target
   // for a typed selector on a subclass.
-  cls = ensure(compiler, "B", compiler.coreLibrary.find);
+  cls = ensure(compiler, "B", compiler.commonElements.coreLibrary.find);
   cls.ensureResolved(compiler.resolution);
   typeMask = new TypeMask.exact(cls, world);
   Expect.isTrue(selector.applies(method, world));
   Expect.isTrue(typeMask.canHit(method, selector, world));
 }
 
 Future testAnalyzeAllInjectedMembers() async {
   Future expect(String patchText, [expectedWarnings]) async {
     if (expectedWarnings == null) expectedWarnings = [];
     if (expectedWarnings is! List) {
@@ skipping 55 matching lines @@
       @patch
       factory B.patchInjected() = _C.injected;
     }
     class _C extends B {
       _C.injected() : super.patchTarget();
     }
     """;
 
   var compiler = await applyPatch(origin, patch, analyzeAll: true,
                  analyzeOnly: true, runCompiler: true);
-  ClassElement clsA = compiler.coreLibrary.find("A");
-  ClassElement clsB = compiler.coreLibrary.find("B");
+  ClassElement clsA = compiler.commonElements.coreLibrary.find("A");
+  ClassElement clsB = compiler.commonElements.coreLibrary.find("B");
 
   ConstructorElement forward = clsA.lookupConstructor("forward");
   ConstructorElement target = forward.effectiveTarget;
   Expect.isTrue(target.isPatched, "Unexpected target $target for $forward");
   Expect.isFalse(target.isPatch, "Unexpected target $target for $forward");
   Expect.equals("patchTarget", target.name);
 
   ConstructorElement forwardOne = clsA.lookupConstructor("forwardOne");
   target = forwardOne.effectiveTarget;
   Expect.isFalse(forwardOne.isMalformed);
@@ skipping 66 matching lines @@
     await testPatchNonFunction();
 
     await testPatchAndSelector();
 
     await testEffectiveTarget();
 
     await testAnalyzeAllInjectedMembers();
     await testTypecheckPatchedMembers();
   });
 }