Address review comments from 150935

Change-Id: Ia137c8c139e13cb9b3f8017328f5a79edfcbc0b2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151022
Reviewed-by: Sigmund Cherem <[email protected]>
Commit-Queue: Stephen Adams <[email protected]>

Author: rakudrama

pkg/compiler/lib/src/ir/static_type.dart

@@ -1943,10 +1943,10 @@ class TypeMap {
         if (newTypesOfInterest.length > 1 ||
             (newTypesOfInterest.length == 1 &&
                 newTypesOfInterest.single != info.declaredType)) {
-          // If [newTypesOfInterest] only contains the we have no information
-          // about the variable (it is either an instance of its declared type
-          // or null) and the canonical way to represent this is to have _no_
-          // target info.
+          // If [newTypesOfInterest] only contains the declared type we have no
+          // information about the variable (it is either an instance of its
+          // declared type or null) and the canonical way to represent this is
+          // to have _no_ target info.
           TypeHolder typeHolderIfNonNull =
               new TypeHolder(info.declaredType, newTypesOfInterest, null);
           TypeHolder typeHolderIfNull = new TypeHolder(info.declaredType, null,

tests/dart2js/regress_42281_test.dart

@@ -25,7 +25,7 @@ ComponentFactory? test(String s, [Map<String, ComponentFactory>? mf2]) {
   return f;
 }
 
-work() {
+main() {
   Map<String, ComponentFactory> mf2 = {'int': ComponentFactory<num>()};
 
   test('String');
@@ -35,12 +35,3 @@ work() {
   test('RegExp');
   test('RegExp', mf2);
 }
-
-main() {
-  try {
-    work();
-  } catch (e, st) {
-    print(e);
-    print(st);
-  }
-}

tests/dart2js_2/regress_42281_test.dart

@@ -25,7 +25,7 @@ ComponentFactory test(String s, [Map<String, ComponentFactory> mf2]) {
   return f;
 }
 
-work() {
+main() {
   Map<String, ComponentFactory> mf2 = {'int': ComponentFactory<num>()};
 
   test('String');
@@ -35,12 +35,3 @@ work() {
   test('RegExp');
   test('RegExp', mf2);
 }
-
-main() {
-  try {
-    work();
-  } catch (e, st) {
-    print(e);
-    print(st);
-  }
-}