commit fa1034c563b44c4f557814c50e2678e14dcd1d13
author Santiago Aboy Solanes <solanes@google.com> Tue Aug 09 11:54:19 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 09 13:21:11 2022 +0000
tree 6353ca19b0f193183310ad7cd77c199bce64eb18
parent 6981ef9238ce2d4ea3f7a86d3faf5d720c8c4641

Revert "Propagating values from if clauses to its successors"

This reverts commit c6b816ceb2b35300c937ef2e7d008598b6afba21.

Reason for revert: Broke libcore test https://ci.chromium.org/ui/p/art/builders/ci/angler-armv7-ndebug/3179/overview

Change-Id: I4f238bd20cc485e49078104e0225c373cac23415

test/564-checker-inline-loop/src/Main.java

diff --git a/test/564-checker-inline-loop/src/Main.java b/test/564-checker-inline-loop/src/Main.java
index 41eca35..6929913 100644
--- a/test/564-checker-inline-loop/src/Main.java
+++ b/test/564-checker-inline-loop/src/Main.java
@@ -21,6 +21,9 @@
   /// CHECK-DAG:                      Return [<<Invoke>>]
 
   /// CHECK-START: int Main.inlineLoop() inliner (after)
+  /// CHECK-NOT:                      InvokeStaticOrDirect
+
+  /// CHECK-START: int Main.inlineLoop() inliner (after)
   /// CHECK-DAG:     <<Constant:i\d+>>   IntConstant 42
   /// CHECK-DAG:                         Return [<<Constant>>]
 
@@ -28,31 +31,31 @@
   /// CHECK:                         Goto loop:{{B\d+}}
 
   public static int inlineLoop() {
-    return $inline$loopMethod();
+    return loopMethod();
   }
 
   /// CHECK-START: void Main.inlineWithinLoop() inliner (before)
   /// CHECK:      InvokeStaticOrDirect
 
+  /// CHECK-START: void Main.inlineWithinLoop() inliner (after)
+  /// CHECK-NOT:  InvokeStaticOrDirect
+
   /// CHECK-START: void Main.inlineWithinLoop() licm (after)
   /// CHECK-DAG:  Goto loop:<<OuterLoop:B\d+>> outer_loop:none
   /// CHECK-DAG:  Goto outer_loop:<<OuterLoop>>
 
   public static void inlineWithinLoop() {
     while (doLoop) {
-      $inline$loopMethod();
+      loopMethod();
     }
   }
 
-  public static int $inline$loopMethod() {
-    // We use `otherDoLoop` here so we don't propagate the knowledge that `doLoop` is true when
-    // inlining from `inlineWithinLoop`.
-    while (otherDoLoop) {}
+  public static int loopMethod() {
+    while (doLoop) {}
     return 42;
   }
 
   public static boolean doLoop = false;
-  public static boolean otherDoLoop = false;
 
   public static void main(String[] args) {
     inlineLoop();