Remove the word "strongMode" from some package:kernel libraries.

Temporarily using "legacyMode" instead, but I plan to rid these soon.

Change-Id: Iff8bcde03b6ebe4ad95f963f456c855e73e58926
Reviewed-on: https://dart-review.googlesource.com/c/79042
Auto-Submit: Peter von der Ahé <ahe@google.com>
Reviewed-by: Jens Johansen <jensj@google.com>

Author: peter-ahe-google

pkg/dev_compiler/lib/src/kernel/constants.dart

@@ -182,8 +182,9 @@ class _ConstantEvaluator extends ConstantEvaluator {
   _ConstantEvaluator(TypeEnvironment types, this.declaredVariables,
       {bool enableAsserts})
       : unavailableConstant = InstanceConstant(null, [], {}),
-        super(_ConstantsBackend(types.coreTypes), types, types.coreTypes, true,
-            enableAsserts, const _ErrorReporter()) {
+        super(_ConstantsBackend(types.coreTypes), types, types.coreTypes,
+            enableAsserts,
+            errorReporter: const _ErrorReporter()) {
     env = EvaluationEnvironment();
   }
 

pkg/kernel/bin/transform.dart

@@ -101,11 +101,12 @@ Future<CompilerOutcome> runTransformation(List<String> arguments) async {
       final Map<String, String> defines = null;
       final VmConstantsBackend backend =
           new VmConstantsBackend(defines, coreTypes);
-      component = constants.transformComponent(component, backend);
+      component =
+          constants.transformComponent(component, backend, legacyMode: true);
       break;
     case 'treeshake':
       component = treeshaker.transformComponent(coreTypes, hierarchy, component,
-          programRoots: programRoots);
+          programRoots: programRoots, legacyMode: true);
       break;
     case 'methodcall':
       component =

pkg/kernel/lib/naive_type_checker.dart

@@ -31,7 +31,7 @@ class StrongModeTypeChecker extends type_checker.TypeChecker {
 
   StrongModeTypeChecker._(this.failures, CoreTypes coreTypes,
       ClassHierarchy hierarchy, bool ignoreSdk)
-      : super(coreTypes, hierarchy, strongMode: true, ignoreSdk: ignoreSdk);
+      : super(coreTypes, hierarchy, ignoreSdk: ignoreSdk);
 
   // TODO(vegorov) this only gets called for immediate overrides which leads
   // to less strict checking that Dart 2.0 specification demands for covariant
@@ -164,8 +164,7 @@ ${ownType} is not a subtype of ${superType}
 
     if (!_isSubtypeOf(ownSubstitution.substituteType(ownFunction.returnType),
         superSubstitution.substituteType(superFunction.returnType))) {
-      return 'return type of override ${ownFunction
-          .returnType} is not a subtype'
+      return 'return type of override ${ownFunction.returnType} is not a subtype'
           ' of ${superFunction.returnType}';
     }
 

pkg/kernel/lib/transformations/constants.dart

@@ -30,7 +30,7 @@ import '../type_environment.dart';
 
 Component transformComponent(Component component, ConstantsBackend backend,
     {bool keepFields: false,
-    bool strongMode: false,
+    bool legacyMode: false,
     bool enableAsserts: false,
     bool evaluateAnnotations: true,
     CoreTypes coreTypes,
@@ -40,11 +40,11 @@ Component transformComponent(Component component, ConstantsBackend backend,
   hierarchy ??= new ClassHierarchy(component);
 
   final typeEnvironment =
-      new TypeEnvironment(coreTypes, hierarchy, strongMode: strongMode);
+      new TypeEnvironment(coreTypes, hierarchy, strongMode: !legacyMode);
 
   transformLibraries(component.libraries, backend, coreTypes, typeEnvironment,
       keepFields: keepFields,
-      strongMode: strongMode,
+      legacyMode: legacyMode,
       enableAsserts: enableAsserts,
       evaluateAnnotations: evaluateAnnotations,
       errorReporter: errorReporter);
@@ -54,9 +54,9 @@ Component transformComponent(Component component, ConstantsBackend backend,
 void transformLibraries(List<Library> libraries, ConstantsBackend backend,
     CoreTypes coreTypes, TypeEnvironment typeEnvironment,
     {bool keepFields: false,
+    bool legacyMode: false,
     bool keepVariables: false,
     bool evaluateAnnotations: true,
-    bool strongMode: false,
     bool enableAsserts: false,
     ErrorReporter errorReporter: const _SimpleErrorReporter()}) {
   final ConstantsTransformer constantsTransformer = new ConstantsTransformer(
@@ -66,9 +66,9 @@ void transformLibraries(List<Library> libraries, ConstantsBackend backend,
       evaluateAnnotations,
       coreTypes,
       typeEnvironment,
-      strongMode,
       enableAsserts,
-      errorReporter);
+      errorReporter,
+      legacyMode: legacyMode);
   for (final Library library in libraries) {
     constantsTransformer.convertLibrary(library);
   }
@@ -91,11 +91,12 @@ class ConstantsTransformer extends Transformer {
       this.evaluateAnnotations,
       this.coreTypes,
       this.typeEnvironment,
-      bool strongMode,
       bool enableAsserts,
-      ErrorReporter errorReporter)
-      : constantEvaluator = new ConstantEvaluator(backend, typeEnvironment,
-            coreTypes, strongMode, enableAsserts, errorReporter);
+      ErrorReporter errorReporter,
+      {bool legacyMode: false})
+      : constantEvaluator = new ConstantEvaluator(
+            backend, typeEnvironment, coreTypes, enableAsserts,
+            legacyMode: legacyMode, errorReporter: errorReporter);
 
   // Transform the library/class members:
 
@@ -362,7 +363,7 @@ class ConstantEvaluator extends RecursiveVisitor {
   final ConstantsBackend backend;
   final CoreTypes coreTypes;
   final TypeEnvironment typeEnvironment;
-  final bool strongMode;
+  final bool legacyMode;
   final bool enableAsserts;
   final ErrorReporter errorReporter;
 
@@ -378,9 +379,10 @@ class ConstantEvaluator extends RecursiveVisitor {
   InstanceBuilder instanceBuilder;
   EvaluationEnvironment env;
 
-  ConstantEvaluator(this.backend, this.typeEnvironment, this.coreTypes,
-      this.strongMode, this.enableAsserts,
-      [this.errorReporter = const _SimpleErrorReporter()])
+  ConstantEvaluator(
+      this.backend, this.typeEnvironment, this.coreTypes, this.enableAsserts,
+      {this.legacyMode: false,
+      this.errorReporter = const _SimpleErrorReporter()})
       : canonicalizationCache = <Constant, Constant>{},
         nodeCache = <Node, Constant>{};
 
@@ -1195,7 +1197,7 @@ class ConstantEvaluator extends RecursiveVisitor {
   }
 
   int _wrapAroundInteger(int value) {
-    if (strongMode) {
+    if (!legacyMode) {
       return value.toSigned(64);
     }
     return value;

pkg/kernel/lib/transformations/treeshaker.dart

@@ -12,9 +12,9 @@ import '../library_index.dart';
 
 Component transformComponent(
     CoreTypes coreTypes, ClassHierarchy hierarchy, Component component,
-    {List<ProgramRoot> programRoots, bool strongMode: false}) {
+    {List<ProgramRoot> programRoots, bool legacyMode: false}) {
   new TreeShaker(coreTypes, hierarchy, component,
-          programRoots: programRoots, strongMode: strongMode)
+          programRoots: programRoots, legacyMode: legacyMode)
       .transform(component);
   return component;
 }
@@ -98,7 +98,7 @@ class TreeShaker {
   final Map<Class, int> numberedClasses;
   final List<Class> classes;
   final Component component;
-  final bool strongMode;
+  final bool legacyMode;
   final List<ProgramRoot> programRoots;
 
   /// Map from classes to set of names that have been dispatched with that class
@@ -179,9 +179,9 @@ class TreeShaker {
   bool get forceShaking => programRoots != null && programRoots.isNotEmpty;
 
   TreeShaker(CoreTypes coreTypes, ClassHierarchy hierarchy, Component component,
-      {bool strongMode: false, List<ProgramRoot> programRoots})
+      {List<ProgramRoot> programRoots, bool legacyMode: false})
       : this._internal(
-            coreTypes, hierarchy, component, strongMode, programRoots);
+            coreTypes, hierarchy, component, legacyMode, programRoots);
 
   bool isMemberBodyUsed(Member member) {
     return _usedMembers.containsKey(member);
@@ -229,7 +229,7 @@ class TreeShaker {
   }
 
   TreeShaker._internal(this.coreTypes, this.hierarchy, this.component,
-      this.strongMode, this.programRoots)
+      this.legacyMode, this.programRoots)
       : this._dispatchedNames = new List<Set<Name>>(hierarchy.numberOfClasses),
         this._usedMembersWithHost =
             new List<Set<Member>>(hierarchy.numberOfClasses),
@@ -284,7 +284,7 @@ class TreeShaker {
 
     // Mark overridden members in order to preserve abstract members as
     // necessary.
-    if (strongMode) {
+    if (!legacyMode) {
       for (int i = classes.length - 1; i >= 0; --i) {
         Class class_ = classes[i];
         if (isHierarchyUsed(class_)) {
@@ -669,7 +669,7 @@ class _TreeShakerVisitor extends RecursiveVisitor {
   _TreeShakerVisitor(TreeShaker shaker)
       : this.shaker = shaker,
         this.coreTypes = shaker.coreTypes,
-        this.strongMode = shaker.strongMode,
+        this.strongMode = !shaker.legacyMode,
         this.types = new TypeEnvironment(shaker.coreTypes, shaker.hierarchy) {
     types.errorHandler = handleError;
   }

pkg/kernel/lib/type_checker.dart

@@ -20,10 +20,9 @@ abstract class TypeChecker {
   TypeEnvironment environment;
 
   TypeChecker(this.coreTypes, this.hierarchy,
-      {bool strongMode: false, this.ignoreSdk: true}) {
-    environment =
-        new TypeEnvironment(coreTypes, hierarchy, strongMode: strongMode);
-  }
+      {bool legacyMode: false, this.ignoreSdk: true})
+      : environment =
+            new TypeEnvironment(coreTypes, hierarchy, strongMode: !legacyMode);
 
   void checkComponent(Component component) {
     for (var library in component.libraries) {
@@ -819,17 +818,15 @@ class TypeCheckingVisitor
       if (iteratorGetter == null) return const DynamicType();
       var castedIterable = hierarchy.getTypeAsInstanceOf(
           iterable, iteratorGetter.enclosingClass);
-      var iteratorType = Substitution
-          .fromInterfaceType(castedIterable)
+      var iteratorType = Substitution.fromInterfaceType(castedIterable)
           .substituteType(iteratorGetter.getterType);
       if (iteratorType is InterfaceType) {
         var currentGetter =
             hierarchy.getInterfaceMember(iteratorType.classNode, currentName);
         if (currentGetter == null) return const DynamicType();
         var castedIteratorType = hierarchy.getTypeAsInstanceOf(
             iteratorType, currentGetter.enclosingClass);
-        return Substitution
-            .fromInterfaceType(castedIteratorType)
+        return Substitution.fromInterfaceType(castedIteratorType)
             .substituteType(currentGetter.getterType);
       }
     }

pkg/kernel/test/treeshaker_bench.dart

@@ -59,7 +59,7 @@ void main(List<String> args) {
   ClassHierarchy sharedClassHierarchy = buildClassHierarchy();
   int coldHierarchyTime = watch.elapsedMicroseconds;
   var shaker = new TreeShaker(coreTypes, sharedClassHierarchy, component,
-      strongMode: strongMode);
+      legacyMode: !strongMode);
   if (options['diagnose']) {
     print(shaker.getDiagnosticString());
   }
@@ -80,7 +80,7 @@ void main(List<String> args) {
     watch.reset();
     var hierarchy = getClassHierarchy();
     hotHierarchyTime += watch.elapsedMicroseconds;
-    new TreeShaker(coreTypes, hierarchy, component, strongMode: strongMode);
+    new TreeShaker(coreTypes, hierarchy, component, legacyMode: !strongMode);
     hotTreeShakingTime += watch.elapsedMicroseconds;
   }
   hotHierarchyTime ~/= numberOfTrials;

pkg/kernel/test/treeshaker_check.dart

@@ -24,7 +24,8 @@ main(List<String> args) {
   var component = loadComponentFromBinary(args[0]);
   var coreTypes = new CoreTypes(component);
   var hierarchy = new ClassHierarchy(component);
-  var shaker = new TreeShaker(coreTypes, hierarchy, component);
+  var shaker =
+      new TreeShaker(coreTypes, hierarchy, component, legacyMode: true);
   shaker.transform(component);
   new TreeShakingSanityCheck(shaker).visit(component);
 }

pkg/kernel/test/treeshaker_dump.dart

@@ -69,7 +69,7 @@ main(List<String> args) {
   CoreTypes coreTypes = new CoreTypes(component);
   ClassHierarchy hierarchy = new ClassHierarchy(component);
   TreeShaker shaker =
-      new TreeShaker(coreTypes, hierarchy, component, strongMode: strong);
+      new TreeShaker(coreTypes, hierarchy, component, legacyMode: !strong);
   int totalClasses = 0;
   int totalInstantiationCandidates = 0;
   int totalMembers = 0;
@@ -132,7 +132,7 @@ main(List<String> args) {
     StringBuffer before = new StringBuffer();
     new Printer(before, syntheticNames: names).writeComponentFile(component);
     new File(beforeFile).writeAsStringSync('$before');
-    new TreeShaker(coreTypes, hierarchy, component, strongMode: strong)
+    new TreeShaker(coreTypes, hierarchy, component, legacyMode: !strong)
         .transform(component);
     StringBuffer after = new StringBuffer();
     new Printer(after, syntheticNames: names).writeComponentFile(component);

pkg/kernel/test/treeshaker_membench.dart

@@ -46,7 +46,7 @@ main(List<String> args) {
 
   TreeShaker buildTreeShaker() {
     return new TreeShaker(coreTypes, hierarchy, component,
-        strongMode: strongMode);
+        legacyMode: !strongMode);
   }
 
   List<TreeShaker> keepAlive = <TreeShaker>[];