Version 3.4.0-275.0.dev

Merge 77d10f2 into dev
dart-lang · Mar 26, 2024 · a600b67 · a600b67
2 parents 9b9e5eb + 77d10f2
commit a600b67
Show file tree

Hide file tree

Showing 52 changed files with 261 additions and 220 deletions.
diff --git a/runtime/tests/vm/dart/address_local_pointer_il_test.dart b/runtime/tests/vm/dart/address_local_pointer_il_test.dart
@@ -28,7 +28,7 @@ void matchIL$identity(FlowGraph graph) {
                 from: 'int64', to: 'uint32', is_truncating: true),
         'retval' << match.IntConverter('uint32', from: 'uint32', to: 'int64'),
       ],
-      match.Return(retval),
+      match.DartReturn(retval),
     ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/block_ordering_il_test.dart b/runtime/tests/vm/dart/block_ordering_il_test.dart
@@ -170,11 +170,11 @@ void matchIL$throwInALoop(FlowGraph graph) {
         ]),
     'return_found' <<
         match.block('Target', [
-          match.Return('i'),
+          match.DartReturn('i'),
         ]),
     'return_fail' <<
         match.block('Target', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
     'throw' <<
         match.block('Target', [

diff --git a/runtime/tests/vm/dart/comparison_canonicalization_il_test.dart b/runtime/tests/vm/dart/comparison_canonicalization_il_test.dart
@@ -47,11 +47,11 @@ void matchIL$strictCompareValueEqConstant(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('int 0'),
+          match.DartReturn('int 0'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('int 42'),
+          match.DartReturn('int 42'),
         ]),
   ]);
 }
@@ -80,11 +80,11 @@ void matchIL$strictCompareConstantEqValue(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('int 0'),
+          match.DartReturn('int 0'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('int 42'),
+          match.DartReturn('int 42'),
         ]),
   ]);
 }
@@ -113,11 +113,11 @@ void matchIL$strictCompareValueNeConstant(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('int 42'),
+          match.DartReturn('int 42'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('int 0'),
+          match.DartReturn('int 0'),
         ]),
   ]);
 }
@@ -146,11 +146,11 @@ void matchIL$strictCompareConstantNeValue(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('int 42'),
+          match.DartReturn('int 42'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('int 0'),
+          match.DartReturn('int 0'),
         ]),
   ]);
 }
@@ -179,11 +179,11 @@ void matchIL$strictCompareBoolEqTrue(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('false'),
+          match.DartReturn('false'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('true'),
+          match.DartReturn('true'),
         ]),
   ]);
 }
@@ -212,11 +212,11 @@ void matchIL$strictCompareBoolNeTrue(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('true'),
+          match.DartReturn('true'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('false'),
+          match.DartReturn('false'),
         ]),
   ]);
 }
@@ -245,11 +245,11 @@ void matchIL$equalityCompareValueEqConstant(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('int 1'),
+          match.DartReturn('int 1'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('int 42'),
+          match.DartReturn('int 42'),
         ]),
   ]);
 }
@@ -282,11 +282,11 @@ void matchIL$foldingOfRepeatedComparison(FlowGraph graph) {
     ]),
     'B1' <<
         match.block('Target', [
-          match.Return('int 1'),
+          match.DartReturn('int 1'),
         ]),
     'B2' <<
         match.block('Target', [
-          match.Return('int 42'),
+          match.DartReturn('int 42'),
         ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/devirtualization_during_inlining_il_test.dart b/runtime/tests/vm/dart/devirtualization_during_inlining_il_test.dart
@@ -71,7 +71,7 @@ void matchIL$test(FlowGraph graph) {
         ]),
     'LoopExit' <<
         match.block('Target', [
-          match.Return(),
+          match.DartReturn(),
         ]),
     'LoopBody' <<
         match.block('Target', [

diff --git a/runtime/tests/vm/dart/eliminate_allocations_il_test.dart b/runtime/tests/vm/dart/eliminate_allocations_il_test.dart
@@ -51,7 +51,7 @@ void matchIL$bar(FlowGraph graph) {
         ]),
     'B5' <<
         match.block('Join', [
-          match.Return('c_42'),
+          match.DartReturn('c_42'),
         ]),
     'B6' << match.block('CatchBlock'),
   ]);

diff --git a/runtime/tests/vm/dart/inline_local_functions_il_test.dart b/runtime/tests/vm/dart/inline_local_functions_il_test.dart
@@ -54,7 +54,7 @@ void matchIL$main_foo(FlowGraph graph) {
     'B4' <<
         match.block('Target', [
           'v27' << match.BoxInt64('v5'),
-          match.Return('v27'),
+          match.DartReturn('v27'),
         ]),
   ]);
 }
diff --git a/runtime/tests/vm/dart/numeric_unboxing_il_test.dart b/runtime/tests/vm/dart/numeric_unboxing_il_test.dart
@@ -74,7 +74,7 @@ void matchIL$unboxed1(FlowGraph graph) {
       'box_w' << match.Box('w'),
       match.StaticCall('box_w'),
       'result' << match.BinaryInt64Op('x', 'z'),
-      match.Return('result'),
+      match.DartReturn('result'),
     ]),
   ]);
 }
@@ -104,7 +104,7 @@ void matchIL$unboxed2(FlowGraph graph) {
       'box_w' << match.Box('w'),
       match.StaticCall('box_w'),
       'result' << match.BinaryDoubleOp('y', 'w'),
-      match.Return('result'),
+      match.DartReturn('result'),
     ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/pointer_as_typed_list_il_test.dart b/runtime/tests/vm/dart/pointer_as_typed_list_il_test.dart
@@ -43,15 +43,15 @@ void matchIL$copyPointerContents(FlowGraph graph) {
     ]),
     'B4' <<
         match.block('Target', [
-          match.Return('cnull'),
+          match.DartReturn('cnull'),
         ]),
     'B96' <<
         match.block('Target', [
           'dest.data' << match.LoadField('dest', slot: 'PointerBase.data'),
           'src.data' << match.LoadField('src', slot: 'PointerBase.data'),
           match.MemoryCopy('src.data', 'dest.data', 'c0', 'c0', 'c25',
               element_size: 4),
-          match.Return('cnull'),
+          match.DartReturn('cnull'),
         ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/records_allocation_sinking_il_test.dart b/runtime/tests/vm/dart/records_allocation_sinking_il_test.dart
@@ -45,7 +45,7 @@ void matchIL$test(FlowGraph graph) {
       match.StaticCall(),
       match.MoveArgument('baz_boxed'),
       match.StaticCall(),
-      match.Return(),
+      match.DartReturn(),
     ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/records_field_operations_il_test.dart b/runtime/tests/vm/dart/records_field_operations_il_test.dart
@@ -138,7 +138,7 @@ void matchIL$testDouble(FlowGraph graph) {
       'v7_boxed' << match.Box('v7'),
       match.MoveArgument('v7_boxed'),
       match.StaticCall(),
-      match.Return(),
+      match.DartReturn(),
     ]),
   ]);
 }
@@ -274,7 +274,7 @@ void matchIL$testInt(FlowGraph graph) {
       'v7_boxed' << match.BoxInt64('v7'),
       match.MoveArgument('v7_boxed'),
       match.StaticCall(),
-      match.Return(),
+      match.DartReturn(),
     ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/records_return_value_unboxing_il_test.dart b/runtime/tests/vm/dart/records_return_value_unboxing_il_test.dart
@@ -62,7 +62,7 @@ void matchIL$getRecord1(FlowGraph graph) {
       'y' << match.Parameter(index: 1),
       'x_boxed' << match.BoxInt64('x'),
       'pair' << match.MakePair('x_boxed', 'y'),
-      match.Return('pair'),
+      match.DartReturn('pair'),
     ]),
   ]);
 }
@@ -75,7 +75,7 @@ void matchIL$getRecord2(FlowGraph graph) {
       'bar' << match.Parameter(index: 1),
       'bar_boxed' << match.BoxInt64('bar'),
       'pair' << match.MakePair('bar_boxed', 'foo'),
-      match.Return('pair'),
+      match.DartReturn('pair'),
     ]),
   ]);
 }
@@ -90,7 +90,7 @@ void matchIL$B$get$record3(FlowGraph graph) {
       'x_boxed' << match.BoxInt64('x'),
       'y_boxed' << match.Box('y'),
       'pair' << match.MakePair('x_boxed', 'y_boxed'),
-      match.Return('pair'),
+      match.DartReturn('pair'),
     ]),
   ]);
 }
@@ -105,7 +105,7 @@ void matchIL$B$record4(FlowGraph graph) {
       'x_boxed' << match.BoxInt64('x'),
       'y_boxed' << match.Box('y'),
       'pair' << match.MakePair('x_boxed', 'y_boxed'),
-      match.Return('pair'),
+      match.DartReturn('pair'),
     ]),
   ]);
 }
@@ -155,7 +155,7 @@ void matchIL$testSimple(FlowGraph graph) {
       'r4_boxed' << match.AllocateSmallRecord('r4_0', 'r4_y'),
       match.MoveArgument('r4_boxed'),
       match.StaticCall(),
-      match.Return(),
+      match.DartReturn(),
     ]),
   ]);
 }
@@ -199,7 +199,7 @@ void matchIL$testUnboxedRecordInTryCatch(FlowGraph graph) {
         ]),
     'B3' <<
         match.block('Join', [
-          match.Return(),
+          match.DartReturn(),
         ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/regress_306327173_il_test.dart b/runtime/tests/vm/dart/regress_306327173_il_test.dart
@@ -32,7 +32,7 @@ void matchIL$deref(FlowGraph graph) {
         // 'unboxed' needs to be converted to int64 before returning.
         'address' << match.IntConverter('unboxed', from: 'uint32', to: 'int64'),
       ],
-      match.Return(retvalName),
+      match.DartReturn(retvalName),
     ]),
   ]);
 }

diff --git a/runtime/tests/vm/dart/regress_48764_il_test.dart b/runtime/tests/vm/dart/regress_48764_il_test.dart
@@ -52,7 +52,7 @@ void matchIL$main_testForIn(FlowGraph graph) {
         ]),
     'B4' <<
         match.block('Target', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
     'B3' <<
         match.block('Target', [

diff --git a/runtime/tests/vm/dart/regress_51790_il_test.dart b/runtime/tests/vm/dart/regress_51790_il_test.dart
@@ -48,7 +48,7 @@ void matchIL$sumAll(FlowGraph graph) {
         ]),
     'B4' <<
         match.block('Target', [
-          match.Return('v5'),
+          match.DartReturn('v5'),
         ]),
     'B3' <<
         match.block('Target', [

diff --git a/runtime/tests/vm/dart/regress_53817_il_test.dart b/runtime/tests/vm/dart/regress_53817_il_test.dart
@@ -46,7 +46,7 @@ void matchIL$createAndIterate(FlowGraph graph) {
             ].withoutWildcards),
     'loop_exit' <<
         match.block('Target', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
     'loop_body' <<
         match.block(

diff --git a/runtime/tests/vm/dart/regress_flutter110715_il_test.dart b/runtime/tests/vm/dart/regress_flutter110715_il_test.dart
@@ -63,7 +63,7 @@ void matchIL$bug1(FlowGraph graph) {
         ]),
     'B4' <<
         match.block('Join', [
-          match.Return(),
+          match.DartReturn(),
         ]),
   ]);
 }
@@ -90,7 +90,7 @@ void matchIL$bug2(FlowGraph graph) {
         ]),
     'B4' <<
         match.block('Join', [
-          match.Return(),
+          match.DartReturn(),
         ]),
   ]);
 }
diff --git a/runtime/tests/vm/dart/tearoff_optimizations_il_test.dart b/runtime/tests/vm/dart/tearoff_optimizations_il_test.dart
@@ -106,7 +106,7 @@ void matchIL$testCSE1(FlowGraph graph) {
         ]),
     'B5' <<
         match.block('Join', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
   ]);
 }
@@ -138,7 +138,7 @@ void matchIL$testCSE2(FlowGraph graph) {
         ]),
     'B5' <<
         match.block('Join', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
   ]);
 }
@@ -180,7 +180,7 @@ void matchIL$testCSE3(FlowGraph graph) {
         ]),
     'B5' <<
         match.block('Join', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
   ]);
 }
@@ -212,7 +212,7 @@ void matchIL$testLICM1(FlowGraph graph) {
         ]),
     'B4' <<
         match.block('Target', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
   ]);
 }
@@ -245,7 +245,7 @@ void matchIL$testLICM2(FlowGraph graph) {
         ]),
     'B4' <<
         match.block('Target', [
-          match.Return(match.any),
+          match.DartReturn(match.any),
         ]),
   ]);
 }