[cfe] Update expectations

Some expectations have become out of sync in recently landed CLs.

Change-Id: Ie30897ecce549631d97904e1fd735492844b4014
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443840
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/testcases/general/issue55372.dart.strong.expect

@@ -34,8 +34,8 @@ static extension-member method E|[](lowered final dynamic #this, core::String ke
 static method main() → dynamic {
   {
     self::A a = new self::A::•();
-    let final self::A #t6 = a in #t6 == null ?{core::double?} null : #t6{self::A}.{self::A::foo1}{core::double?} == null ?{core::double?} #t6{self::A}.{self::A::foo1} = 42.0 : null;
-    core::double? x = let final self::A #t7 = a in #t7 == null ?{core::double?} null : let final core::double? #t8 = #t7{self::A}.{self::A::foo1}{core::double?} in #t8 == null ?{core::double} #t7{self::A}.{self::A::foo1} = 42.0 : #t8{core::double};
+    let final self::A #t6 = a in #t6 == null ?{core::double?} null : #t6.{self::A::foo1}{core::double?} == null ?{core::double?} #t6.{self::A::foo1} = 42.0 : null;
+    core::double? x = let final self::A #t7 = a in #t7 == null ?{core::double?} null : let final core::double? #t8 = #t7.{self::A::foo1}{core::double?} in #t8 == null ?{core::double} #t7.{self::A::foo1} = 42.0 : #t8{core::double};
   }
   {
     final core::Map<core::String, core::Map<core::String, core::String>> nestedMap = <core::String, core::Map<core::String, core::String>>{};

pkg/front_end/testcases/general/issue55372.dart.strong.modular.expect

@@ -34,8 +34,8 @@ static extension-member method E|[](lowered final dynamic #this, core::String ke
 static method main() → dynamic {
   {
     self::A a = new self::A::•();
-    let final self::A #t6 = a in #t6 == null ?{core::double?} null : #t6{self::A}.{self::A::foo1}{core::double?} == null ?{core::double?} #t6{self::A}.{self::A::foo1} = 42.0 : null;
-    core::double? x = let final self::A #t7 = a in #t7 == null ?{core::double?} null : let final core::double? #t8 = #t7{self::A}.{self::A::foo1}{core::double?} in #t8 == null ?{core::double} #t7{self::A}.{self::A::foo1} = 42.0 : #t8{core::double};
+    let final self::A #t6 = a in #t6 == null ?{core::double?} null : #t6.{self::A::foo1}{core::double?} == null ?{core::double?} #t6.{self::A::foo1} = 42.0 : null;
+    core::double? x = let final self::A #t7 = a in #t7 == null ?{core::double?} null : let final core::double? #t8 = #t7.{self::A::foo1}{core::double?} in #t8 == null ?{core::double} #t7.{self::A::foo1} = 42.0 : #t8{core::double};
   }
   {
     final core::Map<core::String, core::Map<core::String, core::String>> nestedMap = <core::String, core::Map<core::String, core::String>>{};

pkg/front_end/testcases/general/issue55372.dart.strong.transformed.expect

@@ -34,8 +34,8 @@ static extension-member method E|[](lowered final dynamic #this, core::String ke
 static method main() → dynamic {
   {
     self::A a = new self::A::•();
-    let final self::A #t6 = a in #t6 == null ?{core::double?} null : #t6{self::A}.{self::A::foo1}{core::double?} == null ?{core::double?} #t6{self::A}.{self::A::foo1} = 42.0 : null;
-    core::double? x = let final self::A #t7 = a in #t7 == null ?{core::double?} null : let final core::double? #t8 = #t7{self::A}.{self::A::foo1}{core::double?} in #t8 == null ?{core::double} #t7{self::A}.{self::A::foo1} = 42.0 : #t8{core::double};
+    let final self::A #t6 = a in #t6 == null ?{core::double?} null : #t6.{self::A::foo1}{core::double?} == null ?{core::double?} #t6.{self::A::foo1} = 42.0 : null;
+    core::double? x = let final self::A #t7 = a in #t7 == null ?{core::double?} null : let final core::double? #t8 = #t7.{self::A::foo1}{core::double?} in #t8 == null ?{core::double} #t7.{self::A::foo1} = 42.0 : #t8{core::double};
   }
   {
     final core::Map<core::String, core::Map<core::String, core::String>> nestedMap = <core::String, core::Map<core::String, core::String>>{};

pkg/front_end/testcases/general/null_aware.dart.strong.expect

@@ -26,7 +26,7 @@ static method test() → dynamic {
   self::Foo::staticField = 5;
   let final self::Foo #t2 = foo in #t2.{self::Foo::field}{core::int} == null ?{core::int?} #t2.{self::Foo::field} = 5 : null;
   self::Foo::staticField == null ?{core::int?} self::Foo::staticField = 5 : null;
-  let final self::Foo #t3 = foo in #t3 == null ?{core::int?} null : #t3{self::Foo}.{self::Foo::field}{core::int} == null ?{core::int?} #t3{self::Foo}.{self::Foo::field} = 5 : null;
+  let final self::Foo #t3 = foo in #t3 == null ?{core::int?} null : #t3.{self::Foo::field}{core::int} == null ?{core::int?} #t3.{self::Foo::field} = 5 : null;
   self::Foo::staticField == null ?{core::int?} self::Foo::staticField = 5 : null;
   core::int intValue = let final core::int #t4 = foo.{self::Foo::field}{core::int} in #t4 == null ?{core::int} 6 : #t4;
   core::num numValue = let final core::int #t5 = foo.{self::Foo::field}{core::int} in #t5 == null ?{core::num} 4.5 : #t5;

pkg/front_end/testcases/general/null_aware.dart.strong.modular.expect

@@ -26,7 +26,7 @@ static method test() → dynamic {
   self::Foo::staticField = 5;
   let final self::Foo #t2 = foo in #t2.{self::Foo::field}{core::int} == null ?{core::int?} #t2.{self::Foo::field} = 5 : null;
   self::Foo::staticField == null ?{core::int?} self::Foo::staticField = 5 : null;
-  let final self::Foo #t3 = foo in #t3 == null ?{core::int?} null : #t3{self::Foo}.{self::Foo::field}{core::int} == null ?{core::int?} #t3{self::Foo}.{self::Foo::field} = 5 : null;
+  let final self::Foo #t3 = foo in #t3 == null ?{core::int?} null : #t3.{self::Foo::field}{core::int} == null ?{core::int?} #t3.{self::Foo::field} = 5 : null;
   self::Foo::staticField == null ?{core::int?} self::Foo::staticField = 5 : null;
   core::int intValue = let final core::int #t4 = foo.{self::Foo::field}{core::int} in #t4 == null ?{core::int} 6 : #t4;
   core::num numValue = let final core::int #t5 = foo.{self::Foo::field}{core::int} in #t5 == null ?{core::num} 4.5 : #t5;

pkg/front_end/testcases/general/null_aware.dart.strong.transformed.expect

@@ -26,7 +26,7 @@ static method test() → dynamic {
   self::Foo::staticField = 5;
   let final self::Foo #t2 = foo in #t2.{self::Foo::field}{core::int} == null ?{core::int?} #t2.{self::Foo::field} = 5 : null;
   self::Foo::staticField == null ?{core::int?} self::Foo::staticField = 5 : null;
-  let final self::Foo #t3 = foo in #t3 == null ?{core::int?} null : #t3{self::Foo}.{self::Foo::field}{core::int} == null ?{core::int?} #t3{self::Foo}.{self::Foo::field} = 5 : null;
+  let final self::Foo #t3 = foo in #t3 == null ?{core::int?} null : #t3.{self::Foo::field}{core::int} == null ?{core::int?} #t3.{self::Foo::field} = 5 : null;
   self::Foo::staticField == null ?{core::int?} self::Foo::staticField = 5 : null;
   core::int intValue = let final core::int #t4 = foo.{self::Foo::field}{core::int} in #t4 == null ?{core::int} 6 : #t4;
   core::num numValue = let final core::int #t5 = foo.{self::Foo::field}{core::int} in #t5 == null ?{core::num} 4.5 : #t5;

pkg/front_end/testcases/nnbd/strictly_non_nullable_warnings.dart.strong.expect

@@ -70,7 +70,7 @@ static method warning(core::String s, core::List<core::String> l, core::Map<core
   let final core::String #t15 = s in #t15 == null ?{core::String?} null : #t15.{core::String::substring}(0, 0){(core::int, [core::int?]) → core::String};
   let final core::List<core::String> #t16 = l in #t16 == null ?{core::int?} null : #t16.{core::List::length} = 42;
   let final core::List<core::String> #t17 = l in #t17 == null ?{core::int?} null : #t17.{core::List::length} = #t17.{core::List::length}{core::int}.{core::num::+}(42){(core::num) → core::int};
-  let final core::List<core::String> #t18 = l in #t18 == null ?{core::int?} null : #t18{core::List<core::String>}.{core::List::length}{core::int} == null ?{core::int?} #t18{core::List<core::String>}.{core::List::length} = 42 : null;
+  let final core::List<core::String> #t18 = l in #t18 == null ?{core::int?} null : #t18.{core::List::length}{core::int} == null ?{core::int?} #t18.{core::List::length} = 42 : null;
   let final core::String #t19 = s in #t19 == null ?{core::int?} null : self::E|get#foo(#t19);
   let final core::String #t20 = s in let final core::int #t21 = 42 in self::E|[](#t20, #t21) == null ?{core::int?} self::E|[]=(#t20, #t21, 42) : null;
   let final core::List<core::String> #t22 = l in let final core::int #t23 = 42 in #t22.{core::List::[]}(#t23){(core::int) → core::String} == null ?{core::String?} #t22.{core::List::[]=}(#t23, "foo"){(core::int, core::String) → void} : null;

pkg/front_end/testcases/nnbd/strictly_non_nullable_warnings.dart.strong.modular.expect

@@ -70,7 +70,7 @@ static method warning(core::String s, core::List<core::String> l, core::Map<core
   let final core::String #t15 = s in #t15 == null ?{core::String?} null : #t15.{core::String::substring}(0, 0){(core::int, [core::int?]) → core::String};
   let final core::List<core::String> #t16 = l in #t16 == null ?{core::int?} null : #t16.{core::List::length} = 42;
   let final core::List<core::String> #t17 = l in #t17 == null ?{core::int?} null : #t17.{core::List::length} = #t17.{core::List::length}{core::int}.{core::num::+}(42){(core::num) → core::int};
-  let final core::List<core::String> #t18 = l in #t18 == null ?{core::int?} null : #t18{core::List<core::String>}.{core::List::length}{core::int} == null ?{core::int?} #t18{core::List<core::String>}.{core::List::length} = 42 : null;
+  let final core::List<core::String> #t18 = l in #t18 == null ?{core::int?} null : #t18.{core::List::length}{core::int} == null ?{core::int?} #t18.{core::List::length} = 42 : null;
   let final core::String #t19 = s in #t19 == null ?{core::int?} null : self::E|get#foo(#t19);
   let final core::String #t20 = s in let final core::int #t21 = 42 in self::E|[](#t20, #t21) == null ?{core::int?} self::E|[]=(#t20, #t21, 42) : null;
   let final core::List<core::String> #t22 = l in let final core::int #t23 = 42 in #t22.{core::List::[]}(#t23){(core::int) → core::String} == null ?{core::String?} #t22.{core::List::[]=}(#t23, "foo"){(core::int, core::String) → void} : null;

pkg/front_end/testcases/nnbd/strictly_non_nullable_warnings.dart.strong.transformed.expect

@@ -70,7 +70,7 @@ static method warning(core::String s, core::List<core::String> l, core::Map<core
   let final core::String #t15 = s in #t15 == null ?{core::String?} null : #t15.{core::String::substring}(0, 0){(core::int, [core::int?]) → core::String};
   let final core::List<core::String> #t16 = l in #t16 == null ?{core::int?} null : #t16.{core::List::length} = 42;
   let final core::List<core::String> #t17 = l in #t17 == null ?{core::int?} null : #t17.{core::List::length} = #t17.{core::List::length}{core::int}.{core::num::+}(42){(core::num) → core::int};
-  let final core::List<core::String> #t18 = l in #t18 == null ?{core::int?} null : #t18{core::List<core::String>}.{core::List::length}{core::int} == null ?{core::int?} #t18{core::List<core::String>}.{core::List::length} = 42 : null;
+  let final core::List<core::String> #t18 = l in #t18 == null ?{core::int?} null : #t18.{core::List::length}{core::int} == null ?{core::int?} #t18.{core::List::length} = 42 : null;
   let final core::String #t19 = s in #t19 == null ?{core::int?} null : self::E|get#foo(#t19);
   let final core::String #t20 = s in let final core::int #t21 = 42 in self::E|[](#t20, #t21) == null ?{core::int?} self::E|[]=(#t20, #t21, 42) : null;
   let final core::List<core::String> #t22 = l in let final core::int #t23 = 42 in #t22.{core::List::[]}(#t23){(core::int) → core::String} == null ?{core::String?} #t22.{core::List::[]=}(#t23, "foo"){(core::int, core::String) → void} : null;