Make type system changes backwards compatible

pkg/analyzer/lib/src/task/dart.dart

Index: pkg/analyzer/lib/src/task/dart.dart
diff --git a/pkg/analyzer/lib/src/task/dart.dart b/pkg/analyzer/lib/src/task/dart.dart
index 5bc8a73d430b38b3a1f613606b7dcf85406cc606..a21d94b70519b7b6902aa364ae243d1fbcc77310 100644
--- a/pkg/analyzer/lib/src/task/dart.dart
+++ b/pkg/analyzer/lib/src/task/dart.dart
@@ -1515,13 +1515,12 @@ class ComputeConstantDependenciesTask extends ConstantEvaluationAnalysisTask {
     //
     ConstantEvaluationTarget constant = target;
     TypeProvider typeProvider = getRequiredInput(TYPE_PROVIDER_INPUT);
-    TypeSystem typeSystem = context.typeSystem;
     //
     // Compute dependencies.
     //
     List<ConstantEvaluationTarget> dependencies = <ConstantEvaluationTarget>[];
-    new ConstantEvaluationEngine(
-            typeProvider, typeSystem, context.declaredVariables)
+    new ConstantEvaluationEngine(typeProvider, context.declaredVariables,
+            typeSystem: context.typeSystem)
         .computeDependencies(constant, dependencies.add);
     //
     // Record outputs.
@@ -1607,14 +1606,13 @@ class ComputeConstantValueTask extends ConstantEvaluationAnalysisTask {
     ConstantEvaluationTarget constant = target;
     AnalysisContext context = constant.context;
     TypeProvider typeProvider = getRequiredInput(TYPE_PROVIDER_INPUT);
-    TypeSystem typeSystem = context.typeSystem;
     //
     // Compute the value of the constant, or report an error if there was a
     // cycle.
     //
     ConstantEvaluationEngine constantEvaluationEngine =
-        new ConstantEvaluationEngine(
-            typeProvider, typeSystem, context.declaredVariables);
+        new ConstantEvaluationEngine(typeProvider, context.declaredVariables,
+            typeSystem: context.typeSystem);
     if (dependencyCycle == null) {
       constantEvaluationEngine.computeConstantValue(constant);
     } else {
@@ -2351,7 +2349,7 @@ class GenerateHintsTask extends SourceBasedAnalysisTask {
     //
     // Generate errors.
     //
-    unit.accept(new DeadCodeVerifier(errorReporter, typeSystem));
+    unit.accept(new DeadCodeVerifier(errorReporter, typeSystem: typeSystem));
     // Verify imports.
     {
       ImportsVerifier verifier = new ImportsVerifier();
@@ -2377,8 +2375,8 @@ class GenerateHintsTask extends SourceBasedAnalysisTask {
         new InheritanceManager(libraryElement);
     TypeProvider typeProvider = getRequiredInput(TYPE_PROVIDER_INPUT);
 
-    unit.accept(
-        new BestPracticesVerifier(errorReporter, typeProvider, typeSystem));
+    unit.accept(new BestPracticesVerifier(errorReporter, typeProvider,
+        typeSystem: typeSystem));
     unit.accept(new OverrideVerifier(errorReporter, inheritanceManager));
     // Find to-do comments.
     new ToDoFinder(errorReporter).findIn(unit);
@@ -2463,13 +2461,12 @@ class InferInstanceMembersInUnitTask extends SourceBasedAnalysisTask {
     //
     CompilationUnit unit = getRequiredInput(UNIT_INPUT);
     TypeProvider typeProvider = getRequiredInput(TYPE_PROVIDER_INPUT);
-    TypeSystem typeSystem = context.typeSystem;
     //
     // Infer instance members.
     //
     if (context.analysisOptions.strongMode) {
-      InstanceMemberInferrer inferrer =
-          new InstanceMemberInferrer(typeProvider, typeSystem);
+      InstanceMemberInferrer inferrer = new InstanceMemberInferrer(typeProvider,
+          typeSystem: context.typeSystem);
       inferrer.inferCompilationUnit(unit.element);
     }
     //
@@ -2672,7 +2669,6 @@ class InferStaticVariableTypeTask extends InferStaticVariableTask {
     VariableElementImpl variable = target;
     CompilationUnit unit = getRequiredInput(UNIT_INPUT);
     TypeProvider typeProvider = getRequiredInput(TYPE_PROVIDER_INPUT);
-    TypeSystem typeSystem = context.typeSystem;
     RecordingErrorListener errorListener = new RecordingErrorListener();
     if (dependencyCycle == null) {
       //
@@ -2691,8 +2687,8 @@ class InferStaticVariableTypeTask extends InferStaticVariableTask {
       ResolutionEraser.erase(initializer, eraseDeclarations: false);
       ResolutionContext resolutionContext =
           ResolutionContextBuilder.contextFor(initializer, errorListener);
-      ResolverVisitor visitor = new ResolverVisitor(variable.library,
-          variable.source, typeProvider, typeSystem, errorListener,
+      ResolverVisitor visitor = new ResolverVisitor(
+          variable.library, variable.source, typeProvider, errorListener,
           nameScope: resolutionContext.scope);
       if (resolutionContext.enclosingClassDeclaration != null) {
         visitor.prepareToResolveMembersInClass(
@@ -3151,14 +3147,13 @@ class PartiallyResolveUnitReferencesTask extends SourceBasedAnalysisTask {
     CompilationUnit unit = getRequiredInput(UNIT_INPUT);
     CompilationUnitElement unitElement = unit.element;
     TypeProvider typeProvider = getRequiredInput(TYPE_PROVIDER_INPUT);
-    TypeSystem typeSystem = context.typeSystem;
     //
     // Resolve references.
     //
     InheritanceManager inheritanceManager =
         new InheritanceManager(libraryElement);
-    PartialResolverVisitor visitor = new PartialResolverVisitor(libraryElement,
-        unitElement.source, typeProvider, typeSystem, errorListener,
+    PartialResolverVisitor visitor = new PartialResolverVisitor(
+        libraryElement, unitElement.source, typeProvider, errorListener,
         inheritanceManager: inheritanceManager);
     unit.accept(visitor);
     //
@@ -3374,19 +3369,18 @@ class ResolveFunctionBodiesInUnitTask extends SourceBasedAnalysisTask {
     //
     CompilationUnitElement unitElement = unit.element;
     RecordingErrorListener errorListener = new RecordingErrorListener();
-    TypeSystem typeSystem = context.typeSystem;
     for (CompilationUnitMember unitMember in unit.declarations) {
       if (unitMember is FunctionDeclaration) {
         _resolveFunctionBody(unitMember.functionExpression.body, unitElement,
-            typeProvider, typeSystem, errorListener);
+            typeProvider, errorListener);
       } else if (unitMember is ClassDeclaration) {
         for (ClassMember classMember in unitMember.members) {
           if (classMember is ConstructorDeclaration) {
-            _resolveFunctionBody(classMember.body, unitElement, typeProvider,
-                typeSystem, errorListener);
+            _resolveFunctionBody(
+                classMember.body, unitElement, typeProvider, errorListener);
           } else if (classMember is MethodDeclaration) {
-            _resolveFunctionBody(classMember.body, unitElement, typeProvider,
-                typeSystem, errorListener);
+            _resolveFunctionBody(
+                classMember.body, unitElement, typeProvider, errorListener);
           }
         }
       }
@@ -3402,12 +3396,11 @@ class ResolveFunctionBodiesInUnitTask extends SourceBasedAnalysisTask {
       FunctionBody functionBody,
       CompilationUnitElement unitElement,
       TypeProvider typeProvider,
-      TypeSystem typeSystem,
       RecordingErrorListener errorListener) {
     ResolutionContext resolutionContext =
         ResolutionContextBuilder.contextFor(functionBody, errorListener);
-    ResolverVisitor visitor = new ResolverVisitor(unitElement.library,
-        unitElement.source, typeProvider, typeSystem, errorListener,
+    ResolverVisitor visitor = new ResolverVisitor(
+        unitElement.library, unitElement.source, typeProvider, errorListener,
         nameScope: resolutionContext.scope);
     if (resolutionContext.enclosingClassDeclaration != null) {
       visitor.prepareToResolveMembersInClass(
@@ -3908,7 +3901,6 @@ class VerifyUnitTask extends SourceBasedAnalysisTask {
     CompilationUnit unit = getRequiredInput(UNIT_INPUT);
     CompilationUnitElement unitElement = unit.element;
     LibraryElement libraryElement = unitElement.library;
-    TypeSystem typeSystem = context.typeSystem;
     //
     // Validate the directives.
     //
@@ -3916,8 +3908,8 @@ class VerifyUnitTask extends SourceBasedAnalysisTask {
     //
     // Use the ConstantVerifier to compute errors.
     //
-    ConstantVerifier constantVerifier = new ConstantVerifier(errorReporter,
-        libraryElement, typeProvider, typeSystem, context.declaredVariables);
+    ConstantVerifier constantVerifier = new ConstantVerifier(
+        errorReporter, libraryElement, typeProvider, context.declaredVariables);
     unit.accept(constantVerifier);
     //
     // Use the ErrorVerifier to compute errors.
@@ -3926,7 +3918,6 @@ class VerifyUnitTask extends SourceBasedAnalysisTask {
         errorReporter,
         libraryElement,
         typeProvider,
-        typeSystem,
         new InheritanceManager(libraryElement),
         context.analysisOptions.enableSuperMixins);
     unit.accept(errorVerifier);