[cfe] Only set promoted type when different

This updates the creation of synthesized [VariableGet]s to only set the promoted type if there actually is a promotion, i.e. when the promoted type is different from the declared type.

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

Author: johnniwinther

pkg/front_end/lib/src/type_inference/external_ast_helper.dart

@@ -126,7 +126,7 @@ VariableGet createVariableGet(VariableDeclaration variable,
     {DartType? promotedType}) {
   return new VariableGet(variable)
     ..fileOffset = variable.fileOffset
-    ..promotedType = promotedType;
+    ..promotedType = promotedType != variable.type ? promotedType : null;
 }
 
 /// Creates a [VariableSet] of [variable] with the [value].

pkg/front_end/testcases/dart2js/issue53804.dart.strong.expect

@@ -24,21 +24,21 @@ class A extends core::Object {
         {
           final hoisted core::int? f1;
           if(true) {
-            f1 = #0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t2 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?};
+            f1 = #0#1#isSet ?{core::int?} #0#1 : let final dynamic #t2 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?};
             #t1 = "${f1}";
             break #L1;
           }
         }
         {
           final hoisted core::double? f2;
-          if(#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t3 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t4 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) {
-            f2 = #0#2#isSet ?{core::double?} #0#2{core::double?} : let final dynamic #t5 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?};
+          if(#0#4#isSet ?{core::bool} #0#4 : let final dynamic #t3 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1 : let final dynamic #t4 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) {
+            f2 = #0#2#isSet ?{core::double?} #0#2 : let final dynamic #t5 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?};
             #t1 = "${f2}";
             break #L1;
           }
         }
         {
-          if((#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t6 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t7 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) && (#0#2#isSet ?{core::double?} #0#2{core::double?} : let final dynamic #t8 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?}) == null) {
+          if((#0#4#isSet ?{core::bool} #0#4 : let final dynamic #t6 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1 : let final dynamic #t7 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) && (#0#2#isSet ?{core::double?} #0#2 : let final dynamic #t8 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?}) == null) {
             #t1 = "?";
             break #L1;
           }

pkg/front_end/testcases/dart2js/issue53804.dart.strong.modular.expect

@@ -24,21 +24,21 @@ class A extends core::Object {
         {
           final hoisted core::int? f1;
           if(true) {
-            f1 = #0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t2 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?};
+            f1 = #0#1#isSet ?{core::int?} #0#1 : let final dynamic #t2 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?};
             #t1 = "${f1}";
             break #L1;
           }
         }
         {
           final hoisted core::double? f2;
-          if(#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t3 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t4 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) {
-            f2 = #0#2#isSet ?{core::double?} #0#2{core::double?} : let final dynamic #t5 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?};
+          if(#0#4#isSet ?{core::bool} #0#4 : let final dynamic #t3 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1 : let final dynamic #t4 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) {
+            f2 = #0#2#isSet ?{core::double?} #0#2 : let final dynamic #t5 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?};
             #t1 = "${f2}";
             break #L1;
           }
         }
         {
-          if((#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t6 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t7 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) && (#0#2#isSet ?{core::double?} #0#2{core::double?} : let final dynamic #t8 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?}) == null) {
+          if((#0#4#isSet ?{core::bool} #0#4 : let final dynamic #t6 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1 : let final dynamic #t7 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) && (#0#2#isSet ?{core::double?} #0#2 : let final dynamic #t8 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?}) == null) {
             #t1 = "?";
             break #L1;
           }

pkg/front_end/testcases/dart2js/issue53804.dart.strong.transformed.expect

@@ -24,21 +24,21 @@ class A extends core::Object {
         {
           final hoisted core::int? f1;
           if(true) {
-            f1 = #0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t2 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?};
+            f1 = #0#1#isSet ?{core::int?} #0#1 : let final dynamic #t2 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?};
             #t1 = "${f1}";
             break #L1;
           }
         }
         {
           final hoisted core::double? f2;
-          if(#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t3 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t4 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) {
-            f2 = #0#2#isSet ?{core::double?} #0#2{core::double?} : let final dynamic #t5 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?};
+          if(#0#4#isSet ?{core::bool} #0#4 : let final dynamic #t3 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1 : let final dynamic #t4 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) {
+            f2 = #0#2#isSet ?{core::double?} #0#2 : let final dynamic #t5 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?};
             #t1 = "${f2}";
             break #L1;
           }
         }
         {
-          if((#0#4#isSet ?{core::bool} #0#4{core::bool} : let final dynamic #t6 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1{core::int?} : let final dynamic #t7 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) && (#0#2#isSet ?{core::double?} #0#2{core::double?} : let final dynamic #t8 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?}) == null) {
+          if((#0#4#isSet ?{core::bool} #0#4 : let final dynamic #t6 = #0#4#isSet = true in #0#4 = (#0#1#isSet ?{core::int?} #0#1 : let final dynamic #t7 = #0#1#isSet = true in #0#1 = #0#0.$1{core::int?}) == null) && (#0#2#isSet ?{core::double?} #0#2 : let final dynamic #t8 = #0#2#isSet = true in #0#2 = #0#0.$2{core::double?}) == null) {
             #t1 = "?";
             break #L1;
           }

pkg/front_end/testcases/extension_types/pattern.dart.strong.expect

@@ -36,7 +36,7 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     final synthesized self::MyMap<core::String, core::bool> /* erasure=core::Map<core::String, core::bool> */ #1#0 = map;
     synthesized core::bool? #1#3;
     synthesized core::bool #1#3#isSet = false;
-    if(!((!((#1#3#isSet ?{core::bool?} #1#3{core::bool?} : let final dynamic #t2 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #1#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) && (let final dynamic #t3 = b = (#1#3#isSet ?{core::bool?} #1#3{core::bool?} : let final dynamic #t4 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)))
+    if(!((!((#1#3#isSet ?{core::bool?} #1#3 : let final dynamic #t2 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #1#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) && (let final dynamic #t3 = b = (#1#3#isSet ?{core::bool?} #1#3 : let final dynamic #t4 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)))
       throw{for-error-handling} new core::StateError::•("Pattern matching error");
   }
   {
@@ -55,8 +55,8 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     synthesized core::bool #3#3#isSet = false;
     {
       hoisted core::bool d;
-      if(!((#3#3#isSet ?{core::bool?} #3#3{core::bool?} : let final dynamic #t5 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #3#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) {
-        d = (#3#3#isSet ?{core::bool?} #3#3{core::bool?} : let final dynamic #t6 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool;
+      if(!((#3#3#isSet ?{core::bool?} #3#3 : let final dynamic #t5 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #3#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) {
+        d = (#3#3#isSet ?{core::bool?} #3#3 : let final dynamic #t6 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool;
         {}
       }
     }
@@ -70,7 +70,7 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     {
       lowered hoisted core::int e#case#0;
       lowered hoisted core::int e#case#1;
-      if((#4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t8 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C1 && (let final dynamic #t9 = e#case#0 = #4#0.{core::List::[]}(0){(core::int) → core::int} in true) && e#case#0.{core::num::>}(5){(core::num) → core::bool} && (let final dynamic #t10 = #t7 = e#case#0 in true) || (#4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t11 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C3 && (let final dynamic #t12 = e#case#1 = #4#0.{core::List::[]}(1){(core::int) → core::int} in true) && e#case#1.{core::num::<}(5){(core::num) → core::bool} && (let final dynamic #t13 = #t7 = e#case#1 in true)) {
+      if((#4#1#isSet ?{core::int} #4#1 : let final dynamic #t8 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C1 && (let final dynamic #t9 = e#case#0 = #4#0.{core::List::[]}(0){(core::int) → core::int} in true) && e#case#0.{core::num::>}(5){(core::num) → core::bool} && (let final dynamic #t10 = #t7 = e#case#0 in true) || (#4#1#isSet ?{core::int} #4#1 : let final dynamic #t11 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C3 && (let final dynamic #t12 = e#case#1 = #4#0.{core::List::[]}(1){(core::int) → core::int} in true) && e#case#1.{core::num::<}(5){(core::num) → core::bool} && (let final dynamic #t13 = #t7 = e#case#1 in true)) {
         core::int e = #t7{core::int};
         {
           core::print(e);
@@ -85,7 +85,7 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     synthesized core::bool #5#3#isSet = false;
     {
       hoisted core::bool e;
-      if((!((#5#3#isSet ?{core::bool?} #5#3{core::bool?} : let final dynamic #t14 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) == null) || null is core::bool && #5#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool}) && (let final dynamic #t15 = e = (#5#3#isSet ?{core::bool?} #5#3{core::bool?} : let final dynamic #t16 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)) {
+      if((!((#5#3#isSet ?{core::bool?} #5#3 : let final dynamic #t14 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) == null) || null is core::bool && #5#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool}) && (let final dynamic #t15 = e = (#5#3#isSet ?{core::bool?} #5#3 : let final dynamic #t16 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)) {
         {
           core::print(e);
         }

pkg/front_end/testcases/extension_types/pattern.dart.strong.modular.expect

@@ -36,7 +36,7 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     final synthesized self::MyMap<core::String, core::bool> /* erasure=core::Map<core::String, core::bool> */ #1#0 = map;
     synthesized core::bool? #1#3;
     synthesized core::bool #1#3#isSet = false;
-    if(!((!((#1#3#isSet ?{core::bool?} #1#3{core::bool?} : let final dynamic #t2 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #1#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) && (let final dynamic #t3 = b = (#1#3#isSet ?{core::bool?} #1#3{core::bool?} : let final dynamic #t4 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)))
+    if(!((!((#1#3#isSet ?{core::bool?} #1#3 : let final dynamic #t2 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #1#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) && (let final dynamic #t3 = b = (#1#3#isSet ?{core::bool?} #1#3 : let final dynamic #t4 = #1#3#isSet = true in #1#3 = #1#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)))
       throw{for-error-handling} new core::StateError::•("Pattern matching error");
   }
   {
@@ -55,8 +55,8 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     synthesized core::bool #3#3#isSet = false;
     {
       hoisted core::bool d;
-      if(!((#3#3#isSet ?{core::bool?} #3#3{core::bool?} : let final dynamic #t5 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #3#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) {
-        d = (#3#3#isSet ?{core::bool?} #3#3{core::bool?} : let final dynamic #t6 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool;
+      if(!((#3#3#isSet ?{core::bool?} #3#3 : let final dynamic #t5 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) == null) || null is core::bool && #3#0.{core::Map::containsKey}(#C2){(core::Object?) → core::bool}) {
+        d = (#3#3#isSet ?{core::bool?} #3#3 : let final dynamic #t6 = #3#3#isSet = true in #3#3 = #3#0.{core::Map::[]}(#C2){(core::Object?) → core::bool?}) as{Unchecked} core::bool;
         {}
       }
     }
@@ -70,7 +70,7 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     {
       lowered hoisted core::int e#case#0;
       lowered hoisted core::int e#case#1;
-      if((#4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t8 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C1 && (let final dynamic #t9 = e#case#0 = #4#0.{core::List::[]}(0){(core::int) → core::int} in true) && e#case#0.{core::num::>}(5){(core::num) → core::bool} && (let final dynamic #t10 = #t7 = e#case#0 in true) || (#4#1#isSet ?{core::int} #4#1{core::int} : let final dynamic #t11 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C3 && (let final dynamic #t12 = e#case#1 = #4#0.{core::List::[]}(1){(core::int) → core::int} in true) && e#case#1.{core::num::<}(5){(core::num) → core::bool} && (let final dynamic #t13 = #t7 = e#case#1 in true)) {
+      if((#4#1#isSet ?{core::int} #4#1 : let final dynamic #t8 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C1 && (let final dynamic #t9 = e#case#0 = #4#0.{core::List::[]}(0){(core::int) → core::int} in true) && e#case#0.{core::num::>}(5){(core::num) → core::bool} && (let final dynamic #t10 = #t7 = e#case#0 in true) || (#4#1#isSet ?{core::int} #4#1 : let final dynamic #t11 = #4#1#isSet = true in #4#1 = #4#0.{core::List::length}{core::int}) =={core::num::==}{(core::Object) → core::bool} #C3 && (let final dynamic #t12 = e#case#1 = #4#0.{core::List::[]}(1){(core::int) → core::int} in true) && e#case#1.{core::num::<}(5){(core::num) → core::bool} && (let final dynamic #t13 = #t7 = e#case#1 in true)) {
         core::int e = #t7{core::int};
         {
           core::print(e);
@@ -85,7 +85,7 @@ static method method(self::MyList<core::int> /* erasure=core::List<core::int> */
     synthesized core::bool #5#3#isSet = false;
     {
       hoisted core::bool e;
-      if((!((#5#3#isSet ?{core::bool?} #5#3{core::bool?} : let final dynamic #t14 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) == null) || null is core::bool && #5#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool}) && (let final dynamic #t15 = e = (#5#3#isSet ?{core::bool?} #5#3{core::bool?} : let final dynamic #t16 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)) {
+      if((!((#5#3#isSet ?{core::bool?} #5#3 : let final dynamic #t14 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) == null) || null is core::bool && #5#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool}) && (let final dynamic #t15 = e = (#5#3#isSet ?{core::bool?} #5#3 : let final dynamic #t16 = #5#3#isSet = true in #5#3 = #5#0.{core::Map::[]}(#C1){(core::Object?) → core::bool?}) as{Unchecked} core::bool in true)) {
         {
           core::print(e);
         }