Strong mode cleaning of many dart2js tests.

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;
 import 'package:compiler/src/elements/elements.dart';
@@ skipping 21 matching lines @@
   compiler.registerSource(uri, "$DEFAULT_PATCH_CORE_SOURCE\n$patch");
   if (runCompiler) {
     await compiler.run(null, main);
   } else {
     await compiler.init(main);
   }
   return compiler;
 }
 
 void expectHasBody(compiler, ElementX element) {
-  var node = element.parseNode(compiler.parsingContext);
+  dynamic node = element.parseNode(compiler.parsingContext);
   Expect.isNotNull(node, "Element isn't parseable, when a body was expected");
   Expect.isNotNull(node.body);
   // If the element has a body it is either a Block or a Return statement,
   // both with different begin and end tokens.
   Expect.isTrue(node.body is Block || node.body is Return);
   Expect.notEquals(node.body.getBeginToken(), node.body.getEndToken());
 }
 
 void expectHasNoBody(compiler, ElementX element) {
-  var node = element.parseNode(compiler.parsingContext);
+  dynamic node = element.parseNode(compiler.parsingContext);
   Expect.isNotNull(node, "Element isn't parseable, when a body was expected");
   Expect.isFalse(node.hasBody);
 }
 
 Element ensure(compiler, String name, Element lookup(name),
     {bool expectIsPatched: false,
     bool expectIsPatch: false,
     bool checkHasBody: false,
     bool expectIsGetter: false,
     bool expectIsFound: true,
     bool expectIsRegular: false}) {
-  var element = lookup(name);
+  dynamic element = lookup(name);
   if (!expectIsFound) {
     Expect.isNull(element);
     return element;
   }
   Expect.isNotNull(element);
   if (expectIsGetter) {
     Expect.isTrue(element is AbstractFieldElement);
     Expect.isNotNull(element.getter);
     element = element.getter;
   }
@@ skipping 37 matching lines @@
 
     if (checkHasBody) {
       expectHasBody(compiler, element);
     }
   }
   Expect.isFalse(element.isPatched && element.isPatch);
   return element;
 }
 
 Future testPatchFunction() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       "external test();", "@patch test() { return 'string'; } ");
   ensure(compiler, "test", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true, checkHasBody: true);
   ensure(compiler, "test",
       compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       const a = 0;
       @a external test();
       """,
       """
       const _b = 1;
       @patch @_b test() {}
       """);
   Element origin = ensure(
       compiler, "test", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true, checkHasBody: true);
   Element patch = ensure(compiler, "test",
       compiler.resolution.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,
       "Unexpected patch metadata: ${patch.metadata}.");
 }
 
 Future testPatchFunctionGeneric() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       "external T test<T>();", "@patch T test<T>() { return null; } ");
   Element origin = ensure(
       compiler, "test", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true, checkHasBody: true);
   ensure(compiler, "test",
       compiler.resolution.commonElements.coreLibrary.patch.find,
       expectIsPatch: true, checkHasBody: true);
   compiler.resolver.resolve(origin);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(
       collector.warnings.isEmpty, "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(
       collector.errors.isEmpty, "Unexpected errors: ${collector.errors}");
 }
 
 Future testPatchFunctionGenericExtraTypeVariable() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       "external T test<T>();", "@patch T test<T, S>() { return null; } ");
   Element origin = ensure(
       compiler, "test", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true, checkHasBody: true);
   ensure(compiler, "test",
       compiler.resolution.commonElements.coreLibrary.patch.find,
       expectIsPatch: true, checkHasBody: true);
   compiler.resolver.resolve(origin);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(
       collector.warnings.isEmpty, "Unexpected warnings: ${collector.warnings}");
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(collector.errors.first.message.kind ==
       MessageKind.PATCH_TYPE_VARIABLES_MISMATCH);
 }
 
 Future testPatchFunctionGenericDifferentNames() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       "external T test<T, S>();", "@patch T test<S, T>() { return null; } ");
   Element origin = ensure(
       compiler, "test", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true, checkHasBody: true);
   ensure(compiler, "test",
       compiler.resolution.commonElements.coreLibrary.patch.find,
       expectIsPatch: true, checkHasBody: true);
   compiler.resolver.resolve(origin);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(
       collector.warnings.isEmpty, "Unexpected warnings: ${collector.warnings}");
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(collector.errors.first.message.kind ==
       MessageKind.PATCH_TYPE_VARIABLES_MISMATCH);
 }
 
 Future testPatchConstructor() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         external Class();
       }
       """,
       """
       @patch class Class {
         @patch Class();
       }
       """);
-  var classOrigin = ensure(
+  dynamic classOrigin = ensure(
       compiler, "Class", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true);
   classOrigin.ensureResolved(compiler.resolution);
-  var classPatch = ensure(compiler, "Class",
+  dynamic classPatch = ensure(compiler, "Class",
       compiler.resolution.commonElements.coreLibrary.patch.find,
       expectIsPatch: true);
 
   Expect.equals(classPatch, classOrigin.patch);
   Expect.equals(classOrigin, classPatch.origin);
 
-  var constructorOrigin = ensure(
+  dynamic constructorOrigin = ensure(
       compiler, "", (name) => classOrigin.localLookup(name),
       expectIsPatched: true);
-  var constructorPatch = ensure(
+  dynamic constructorPatch = ensure(
       compiler, "", (name) => classPatch.localLookup(name),
       expectIsPatch: true);
 
   Expect.equals(constructorPatch, constructorOrigin.patch);
   Expect.equals(constructorOrigin, constructorPatch.origin);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(
       collector.warnings.isEmpty, "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(
       collector.errors.isEmpty, "Unexpected errors: ${collector.errors}");
 }
 
 Future testPatchRedirectingConstructor() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         Class(x) : this._(x, false);
 
         external Class._(x, y);
       }
       """,
       r"""
       @patch class Class {
         @patch Class._(x, y) { print('$x,$y'); }
       }
       """);
-  var classOrigin = ensure(
+  dynamic classOrigin = ensure(
       compiler, "Class", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true);
   classOrigin.ensureResolved(compiler.resolution);
 
-  var classPatch = ensure(compiler, "Class",
+  dynamic classPatch = ensure(compiler, "Class",
       compiler.resolution.commonElements.coreLibrary.patch.find,
       expectIsPatch: true);
 
   Expect.equals(classOrigin, classPatch.origin);
   Expect.equals(classPatch, classOrigin.patch);
 
-  var constructorRedirecting =
+  dynamic constructorRedirecting =
       ensure(compiler, "", (name) => classOrigin.localLookup(name));
-  var constructorOrigin = ensure(
+  dynamic constructorOrigin = ensure(
       compiler, "_", (name) => classOrigin.localLookup(name),
       expectIsPatched: true);
-  var constructorPatch = ensure(
+  dynamic constructorPatch = ensure(
       compiler, "_", (name) => classPatch.localLookup(name),
       expectIsPatch: true);
   Expect.equals(constructorOrigin, constructorPatch.origin);
   Expect.equals(constructorPatch, constructorOrigin.patch);
 
   compiler.resolver.resolve(constructorRedirecting);
 
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(
       collector.warnings.isEmpty, "Unexpected warnings: ${collector.warnings}");
   Expect.isTrue(
       collector.errors.isEmpty, "Unexpected errors: ${collector.errors}");
 }
 
 Future testPatchMember() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         external String toString();
       }
       """,
       """
       @patch class Class {
         @patch String toString() => 'string';
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
   ensure(compiler, "Class",
       compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         external int get field;
       }
       """,
       """
       @patch class Class {
         @patch int get field => 5;
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.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,
       expectIsGetter: true, 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 testRegularMember() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         void regular() {}
       }
       """,
       """
       @patch class Class {
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
   ensure(compiler, "Class",
       compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       class Class {
       }
       """,
       """
       @patch class Class {
         void _injected() {}
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
   ensure(compiler, "Class",
       compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       class Class {
       }
       """,
       """
       @patch class Class {
         void injected() {}
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.commonElements.coreLibrary.find,
       expectIsPatched: true);
   container.parseNode(compiler.parsingContext);
   ensure(compiler, "Class",
       compiler.resolution.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;");
+  dynamic compiler = await applyPatch("", "int _function() => 5;");
   ensure(compiler, "_function",
       compiler.resolution.commonElements.coreLibrary.find,
       expectIsFound: false);
   ensure(compiler, "_function",
       compiler.resolution.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;");
+  dynamic compiler = await applyPatch("", "int function() => 5;");
   ensure(
       compiler, "function", compiler.resolution.commonElements.coreLibrary.find,
       expectIsFound: false);
   ensure(compiler, "function",
       compiler.resolution.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);
 }
 
 Future testPatchSignatureCheck() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         external String method1();
         external void method2(String str);
         external void method3(String s1);
         external void method4([String str]);
         external void method5({String str});
         external void method6({String str});
         external void method7([String s1]);
         external void method8({String s1});
@@ skipping 10 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(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.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,
@@ skipping 24 matching lines @@
       [MessageKind.PATCH_PARAMETER_MISMATCH]);
   expect("method9", [MessageKind.PATCH_POINT_TO_PARAMETER],
       [MessageKind.PATCH_PARAMETER_TYPE_MISMATCH]);
   expect("method10", [MessageKind.PATCH_POINT_TO_PARAMETER],
       [MessageKind.PATCH_PARAMETER_TYPE_MISMATCH]);
   expect("method11", [MessageKind.PATCH_POINT_TO_PARAMETER],
       [MessageKind.PATCH_PARAMETER_TYPE_MISMATCH]);
 }
 
 Future testExternalWithoutImplementationTopLevel() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       external void foo();
       """,
       """
       // @patch void foo() {}
       """);
-  var function = ensure(
+  dynamic function = ensure(
       compiler, "foo", compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         external void foo();
       }
       """,
       """
       @patch class Class {
         // @patch void foo() {}
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       class A {}
       """,
       """
       @patch class A {}
       """);
   ClassElement cls = ensure(
       compiler, "A", compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       // class Class {}
       """,
       """
       @patch class Class {}
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   Expect.isTrue(
       collector.warnings.isEmpty, "Unexpected warnings: ${collector.warnings}");
   print('testPatchNonExistingTopLevel:${collector.errors}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NON_EXISTING);
 }
 
 Future testPatchNonExistingMember() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class Class {}
       """,
       """
       @patch class Class {
         @patch void foo() {}
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       external get foo;
       """,
       """
       @patch var foo;
       """);
   ensure(compiler, "foo", compiler.resolution.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(
+  dynamic compiler = await applyPatch(
       """
       external var foo;
       """,
       """
       @patch get foo => 0;
       """);
   ensure(compiler, "foo", compiler.resolution.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
       // handled by the regular parser.
       MessageKind.PATCH_NONPATCHABLE,
       collector.errors.elementAt(1).message.kind);
 }
 
 Future testPatchNonExternalTopLevel() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       void foo() {}
       """,
       """
       @patch void foo() {}
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonExternalTopLevel.errors:${collector.errors}');
   print('testPatchNonExternalTopLevel.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);
   Expect.isTrue(collector.infos.first.message.kind ==
       MessageKind.PATCH_POINT_TO_FUNCTION);
 }
 
 Future testPatchNonExternalMember() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class Class {
         void foo() {}
       }
       """,
       """
       @patch class Class {
         @patch void foo() {}
       }
       """);
-  var container = ensure(
+  dynamic container = ensure(
       compiler, "Class", compiler.resolution.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);
   Expect.isTrue(collector.infos.first.message.kind ==
       MessageKind.PATCH_POINT_TO_FUNCTION);
 }
 
 Future testPatchNonClass() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       external void Class() {}
       """,
       """
       @patch class Class {}
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonClass.errors:${collector.errors}');
   print('testPatchNonClass.warnings:${collector.warnings}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NON_CLASS);
   Expect.equals(0, collector.warnings.length);
   Expect.equals(1, collector.infos.length);
   Expect.isTrue(
       collector.infos.first.message.kind == MessageKind.PATCH_POINT_TO_CLASS);
 }
 
 Future testPatchNonGetter() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       external void foo() {}
       """,
       """
       @patch get foo => 0;
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonClass.errors:${collector.errors}');
   print('testPatchNonClass.warnings:${collector.warnings}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NON_GETTER);
   Expect.equals(0, collector.warnings.length);
   Expect.equals(1, collector.infos.length);
   Expect.isTrue(
       collector.infos.first.message.kind == MessageKind.PATCH_POINT_TO_GETTER);
 }
 
 Future testPatchNoGetter() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       external set foo(var value) {}
       """,
       """
       @patch get foo => 0;
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonClass.errors:${collector.errors}');
   print('testPatchNonClass.warnings:${collector.warnings}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NO_GETTER);
   Expect.equals(0, collector.warnings.length);
   Expect.equals(1, collector.infos.length);
   Expect.isTrue(
       collector.infos.first.message.kind == MessageKind.PATCH_POINT_TO_GETTER);
 }
 
 Future testPatchNonSetter() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       external void foo() {}
       """,
       """
       @patch set foo(var value) {}
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonClass.errors:${collector.errors}');
   print('testPatchNonClass.warnings:${collector.warnings}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NON_SETTER);
   Expect.equals(0, collector.warnings.length);
   Expect.equals(1, collector.infos.length);
   Expect.isTrue(
       collector.infos.first.message.kind == MessageKind.PATCH_POINT_TO_SETTER);
 }
 
 Future testPatchNoSetter() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       external get foo;
       """,
       """
       @patch set foo(var value) {}
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonClass.errors:${collector.errors}');
   print('testPatchNonClass.warnings:${collector.warnings}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NO_SETTER);
   Expect.equals(0, collector.warnings.length);
   Expect.equals(1, collector.infos.length);
   Expect.isTrue(
       collector.infos.first.message.kind == MessageKind.PATCH_POINT_TO_SETTER);
 }
 
 Future testPatchNonFunction() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       external get foo;
       """,
       """
       @patch void foo() {}
       """);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   print('testPatchNonClass.errors:${collector.errors}');
   print('testPatchNonClass.warnings:${collector.warnings}');
   Expect.equals(1, collector.errors.length);
   Expect.isTrue(
       collector.errors.first.message.kind == MessageKind.PATCH_NON_FUNCTION);
   Expect.equals(0, collector.warnings.length);
   Expect.equals(1, collector.infos.length);
   Expect.isTrue(collector.infos.first.message.kind ==
       MessageKind.PATCH_POINT_TO_FUNCTION);
 }
 
 Future testPatchAndSelector() async {
-  var compiler = await applyPatch(
+  dynamic compiler = await applyPatch(
       """
       class A {
         external void clear();
       }
       class B extends A {
       }
       """,
       """
       @patch class A {
         int method() => 0;
@@ skipping 54 matching lines @@
   Expect.isTrue(typeMask.canHit(method, selector, world));
 }
 
 Future testAnalyzeAllInjectedMembers() async {
   Future expect(String patchText, [expectedWarnings]) async {
     if (expectedWarnings == null) expectedWarnings = [];
     if (expectedWarnings is! List) {
       expectedWarnings = <MessageKind>[expectedWarnings];
     }
 
-    var compiler =
+    dynamic compiler =
         await applyPatch('', patchText, analyzeAll: true, analyzeOnly: true);
     compiler.librariesToAnalyzeWhenRun = [Uri.parse('dart:core')];
     await compiler.run(null);
     DiagnosticCollector collector = compiler.diagnosticCollector;
     compareWarningKinds(patchText, expectedWarnings, collector.warnings);
   }
 
   await expect('String s = 0;', MessageKind.NOT_ASSIGNABLE);
   await expect('void method() { String s = 0; }', MessageKind.NOT_ASSIGNABLE);
   await expect(
@@ skipping 41 matching lines @@
       @patch
       factory B.reflectBack() = B.originTarget;
       @patch
       factory B.patchInjected() = _C.injected;
     }
     class _C extends B {
       _C.injected() : super.patchTarget();
     }
     """;
 
-  var compiler = await applyPatch(origin, patch,
+  dynamic compiler = await applyPatch(origin, patch,
       analyzeAll: true, analyzeOnly: true, runCompiler: true);
   ClassElement clsA = compiler.resolution.commonElements.coreLibrary.find("A");
   ClassElement clsB = compiler.resolution.commonElements.coreLibrary.find("B");
+  Expect.isNotNull(clsB);
 
   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 14 matching lines @@
   Expect.equals("injected", target.name);
 }
 
 Future testTypecheckPatchedMembers() async {
   String originText = "external void method();";
   String patchText = """
                      @patch void method() {
                        String s = 0;
                      }
                      """;
-  var compiler = await applyPatch(originText, patchText,
+  dynamic compiler = await applyPatch(originText, patchText,
       analyzeAll: true, analyzeOnly: true);
   compiler.librariesToAnalyzeWhenRun = [Uri.parse('dart:core')];
   await compiler.run(null);
   DiagnosticCollector collector = compiler.diagnosticCollector;
   compareWarningKinds(
       patchText, [MessageKind.NOT_ASSIGNABLE], collector.warnings);
 }
 
 main() {
   asyncTest(() async {
@@ skipping 32 matching lines @@
     await testPatchNonFunction();
 
     await testPatchAndSelector();
 
     await testEffectiveTarget();
 
     await testAnalyzeAllInjectedMembers();
     await testTypecheckPatchedMembers();
   });
 }