Snap for 12969164 from f3c480ffeb31af6c99858b5608ed610018062dae to 25Q2-release

Change-Id: I2c4aabe02793d21090d9f1c9e3a04f3dd1933364

1 files changed, 19 insertions, 19 deletions

diff --git a/test/463-checker-boolean-simplifier/src-art/Main.java b/test/463-checker-boolean-simplifier/src-art/Main.java
index 5105f50a6e..a76966d167 100644
--- a/test/463-checker-boolean-simplifier/src-art/Main.java
+++ b/test/463-checker-boolean-simplifier/src-art/Main.java
@@ -39,7 +39,7 @@ public class Main {
    * and 0 when False.
    */
 
-  /// CHECK-START: boolean Main.GreaterThan(int, int) code_flow_simplifier (before)
+  /// CHECK-START: boolean Main.GreaterThan(int, int) control_flow_simplifier (before)
   /// CHECK-DAG:     <<ParamX:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamY:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<Const0:i\d+>>   IntConstant 0
@@ -49,7 +49,7 @@ public class Main {
   /// CHECK-DAG:     <<Phi:i\d+>>      Phi [<<Const0>>,<<Const1>>]
   /// CHECK-DAG:                       Return [<<Phi>>]
 
-  /// CHECK-START: boolean Main.GreaterThan(int, int) code_flow_simplifier (after)
+  /// CHECK-START: boolean Main.GreaterThan(int, int) control_flow_simplifier (after)
   /// CHECK-DAG:     <<ParamX:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamY:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<Const0:i\d+>>   IntConstant 0
@@ -67,7 +67,7 @@ public class Main {
    * and 1 when False.
    */
 
-  /// CHECK-START: boolean Main.LessThan(int, int) code_flow_simplifier (before)
+  /// CHECK-START: boolean Main.LessThan(int, int) control_flow_simplifier (before)
   /// CHECK-DAG:     <<ParamX:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamY:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<Const0:i\d+>>   IntConstant 0
@@ -77,7 +77,7 @@ public class Main {
   /// CHECK-DAG:     <<Phi:i\d+>>      Phi [<<Const1>>,<<Const0>>]
   /// CHECK-DAG:                       Return [<<Phi>>]
 
-  /// CHECK-START: boolean Main.LessThan(int, int) code_flow_simplifier (after)
+  /// CHECK-START: boolean Main.LessThan(int, int) control_flow_simplifier (after)
   /// CHECK-DAG:     <<ParamX:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamY:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<Const0:i\d+>>   IntConstant 0
@@ -90,7 +90,7 @@ public class Main {
     return (x < y) ? true : false;
   }
 
-  /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) code_flow_simplifier (after)
+  /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) control_flow_simplifier (after)
   /// CHECK-DAG:     <<ParamX:z\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamY:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<Const42:i\d+>>  IntConstant 42
@@ -99,14 +99,14 @@ public class Main {
   /// CHECK-DAG:     <<Select:i\d+>>   Select [<<Const43>>,<<Add>>,<<ParamX>>]
   /// CHECK-DAG:                       Return [<<Select>>]
 
-  /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) code_flow_simplifier (after)
+  /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) control_flow_simplifier (after)
   /// CHECK-NOT:     If
 
   public static int SimpleTrueBlock(boolean x, int y) {
     return x ? y + 42 : 43;
   }
 
-  /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) code_flow_simplifier (after)
+  /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) control_flow_simplifier (after)
   /// CHECK-DAG:     <<ParamX:z\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamY:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<Const42:i\d+>>  IntConstant 42
@@ -115,14 +115,14 @@ public class Main {
   /// CHECK-DAG:     <<Select:i\d+>>   Select [<<Add>>,<<Const42>>,<<ParamX>>]
   /// CHECK-DAG:                       Return [<<Select>>]
 
-  /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) code_flow_simplifier (after)
+  /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) control_flow_simplifier (after)
   /// CHECK-NOT:     If
 
   public static int SimpleFalseBlock(boolean x, int y) {
     return x ? 42 : y + 43;
   }
 
-  /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) code_flow_simplifier (after)
+  /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) control_flow_simplifier (after)
   /// CHECK-DAG:     <<ParamX:z\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamY:i\d+>>   ParameterValue
   /// CHECK-DAG:     <<ParamZ:i\d+>>   ParameterValue
@@ -133,14 +133,14 @@ public class Main {
   /// CHECK-DAG:     <<Select:i\d+>>   Select [<<AddFalse>>,<<AddTrue>>,<<ParamX>>]
   /// CHECK-DAG:                       Return [<<Select>>]
 
-  /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) code_flow_simplifier (after)
+  /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) control_flow_simplifier (after)
   /// CHECK-NOT:     If
 
   public static int SimpleBothBlocks(boolean x, int y, int z) {
     return x ? y + 42 : z + 43;
   }
 
-  /// CHECK-START: int Main.ThreeBlocks(boolean, boolean) code_flow_simplifier (after)
+  /// CHECK-START: int Main.ThreeBlocks(boolean, boolean) control_flow_simplifier (after)
   /// CHECK-DAG:     <<ParamX:z\d+>>    ParameterValue
   /// CHECK-DAG:     <<ParamY:z\d+>>    ParameterValue
   /// CHECK-DAG:     <<Const1:i\d+>>    IntConstant 1
@@ -160,7 +160,7 @@ public class Main {
     }
   }
 
-  /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) code_flow_simplifier (before)
+  /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) control_flow_simplifier (before)
   /// CHECK-DAG:     <<This:l\d+>>    ParameterValue
   /// CHECK-DAG:     <<Cond:z\d+>>    ParameterValue
   /// CHECK-DAG:     <<Const2:i\d+>>  IntConstant 2
@@ -170,14 +170,14 @@ public class Main {
   /// CHECK-DAG:     <<Add:i\d+>>     Add [<<Iget>>,<<Const2>>]
   /// CHECK-DAG:                      Phi [<<Add>>,<<Const43>>]
 
-  /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) code_flow_simplifier (after)
+  /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) control_flow_simplifier (after)
   /// CHECK-NOT:     Select
 
   public int TrueBlockWithTooManyInstructions(boolean x) {
     return x ? (read_field + 2) : 43;
   }
 
-  /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) code_flow_simplifier (before)
+  /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) control_flow_simplifier (before)
   /// CHECK-DAG:     <<This:l\d+>>    ParameterValue
   /// CHECK-DAG:     <<Cond:z\d+>>    ParameterValue
   /// CHECK-DAG:     <<Const3:i\d+>>  IntConstant 3
@@ -187,14 +187,14 @@ public class Main {
   /// CHECK-DAG:     <<Add:i\d+>>     Add [<<Iget>>,<<Const3>>]
   /// CHECK-DAG:                      Phi [<<Const42>>,<<Add>>]
 
-  /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) code_flow_simplifier (after)
+  /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) control_flow_simplifier (after)
   /// CHECK-NOT:     Select
 
   public int FalseBlockWithTooManyInstructions(boolean x) {
     return x ? 42 : (read_field + 3);
   }
 
-  /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) code_flow_simplifier (before)
+  /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) control_flow_simplifier (before)
   /// CHECK-DAG:     <<This:l\d+>>    ParameterValue
   /// CHECK-DAG:     <<Cond:z\d+>>    ParameterValue
   /// CHECK-DAG:     <<Const42:i\d+>> IntConstant 42
@@ -203,14 +203,14 @@ public class Main {
   /// CHECK-DAG:                      InstanceFieldSet [<<This>>,<<Const42>>]
   /// CHECK-DAG:                      Phi [<<Const42>>,<<Const43>>]
 
-  /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) code_flow_simplifier (after)
+  /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) control_flow_simplifier (after)
   /// CHECK-NOT:     Select
 
   public int TrueBlockWithSideEffects(boolean x) {
     return x ? (write_field = 42) : 43;
   }
 
-  /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) code_flow_simplifier (before)
+  /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) control_flow_simplifier (before)
   /// CHECK-DAG:     <<This:l\d+>>    ParameterValue
   /// CHECK-DAG:     <<Cond:z\d+>>    ParameterValue
   /// CHECK-DAG:     <<Const42:i\d+>> IntConstant 42
@@ -219,7 +219,7 @@ public class Main {
   /// CHECK-DAG:                      InstanceFieldSet [<<This>>,<<Const43>>]
   /// CHECK-DAG:                      Phi [<<Const42>>,<<Const43>>]
 
-  /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) code_flow_simplifier (after)
+  /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) control_flow_simplifier (after)
   /// CHECK-NOT:     Select
 
   public int FalseBlockWithSideEffects(boolean x) {