Skip to content

Commit

Permalink
[cfe] Update expectations
Browse files Browse the repository at this point in the history
Merge conflict not caught by the trybot.

Change-Id: I41e419fb79e40a5ee1954e8e2e0b51dc63cd15da
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/289905
Commit-Queue: Paul Berry <[email protected]>
Auto-Submit: Johnni Winther <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
  • Loading branch information
johnniwinther authored and Commit Queue committed Mar 20, 2023
1 parent fde66e9 commit 7a09c1e
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 25 deletions.
20 changes: 15 additions & 5 deletions pkg/front_end/testcases/patterns/issue50897.dart.strong.expect
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,21 @@ static method test(core::Map<dynamic, dynamic> map) → core::String {
core::String #t1;
final synthesized core::Map<dynamic, dynamic> #0#0 = map;
late final synthesized dynamic #0#6 = #0#0.{core::Map::[]}(#C1){(core::Object?) → dynamic};
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final dynamic #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true)))
#t1 = "object";
else
if(true)
#t1 = "default";
#L1:
{
{
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final dynamic #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true))) {
#t1 = "object";
break #L1;
}
}
{
if(true) {
#t1 = "default";
break #L1;
}
}
}
} =>#t1;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,21 @@ static method test(core::Map<dynamic, dynamic> map) → core::String {
function ##0#6#initializer() → dynamic
return #0#0.{core::Map::[]}(#C1){(core::Object?) → dynamic};
late final synthesized dynamic #0#6 = ##0#6#initializer(){() → dynamic};
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final self::Unit #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true)))
#t1 = "object";
else
if(true)
#t1 = "default";
#L1:
{
{
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final self::Unit #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true))) {
#t1 = "object";
break #L1;
}
}
{
if(true) {
#t1 = "default";
break #L1;
}
}
}
} =>#t1;
}

Expand Down
20 changes: 15 additions & 5 deletions pkg/front_end/testcases/patterns/issue50897.dart.weak.expect
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,21 @@ static method test(core::Map<dynamic, dynamic> map) → core::String {
core::String #t1;
final synthesized core::Map<dynamic, dynamic> #0#0 = map;
late final synthesized dynamic #0#6 = #0#0.{core::Map::[]}(#C1){(core::Object?) → dynamic};
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final dynamic #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true)))
#t1 = "object";
else
if(true)
#t1 = "default";
#L1:
{
{
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final dynamic #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true))) {
#t1 = "object";
break #L1;
}
}
{
if(true) {
#t1 = "default";
break #L1;
}
}
}
} =>#t1;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,21 @@ static method test(core::Map<dynamic, dynamic> map) → core::String {
core::String #t1;
final synthesized core::Map<dynamic, dynamic> #0#0 = map;
late final synthesized dynamic #0#6 = #0#0.{core::Map::[]}(#C1){(core::Object?) → dynamic};
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final dynamic #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true)))
#t1 = "object";
else
if(true)
#t1 = "default";
#L1:
{
{
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final dynamic #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true))) {
#t1 = "object";
break #L1;
}
}
{
if(true) {
#t1 = "default";
break #L1;
}
}
}
} =>#t1;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,21 @@ static method test(core::Map<dynamic, dynamic> map) → core::String {
function ##0#6#initializer() → dynamic
return #0#0.{core::Map::[]}(#C1){(core::Object?) → dynamic};
late final synthesized dynamic #0#6 = ##0#6#initializer(){() → dynamic};
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final self::Unit #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true)))
#t1 = "object";
else
if(true)
#t1 = "default";
#L1:
{
{
if(#0#0.{core::Map::length}{core::int} =={core::num::==}{(core::Object) → core::bool} #C2 && #0#0.{core::Map::containsKey}(#C1){(core::Object?) → core::bool} && (#0#6 is{ForNonNullableByDefault} self::Square && (let final self::Unit #t2 = #0#6{self::Square}.{self::Square::size}{self::Unit} in true))) {
#t1 = "object";
break #L1;
}
}
{
if(true) {
#t1 = "default";
break #L1;
}
}
}
} =>#t1;
}

Expand Down

0 comments on commit 7a09c1e

Please sign in to comment.