From 64bbae75121ccf80c02a0960e2db62eb558052e6 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Tue, 4 Jun 2024 09:47:08 +0000
Subject: [PATCH] 8333394: C2: assert(bol->is_Opaque4() ||
 bol->is_OpaqueInitializedAssertionPredicate()) failed: Opaque node of
 non-null-check or of Initialized Assertion Predicate

Reviewed-by: thartmann, roland
---
 src/hotspot/share/opto/loopTransform.cpp      |  8 ++-
 .../assertion/TestIfWithPhiInput.java         | 56 +++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/predicates/assertion/TestIfWithPhiInput.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index b2482edbf7a..b4faced574d 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1200,9 +1200,11 @@ bool IdealLoopTree::policy_range_check(PhaseIdealLoop* phase, bool provisional,
         iff->Opcode() == Op_RangeCheck) { // Test?
 
       // Comparing trip+off vs limit
-      Node *bol = iff->in(1);
-      if (bol->req() < 2) {
-        continue; // dead constant test
+      Node* bol = iff->in(1);
+      if (bol->req() != 2) {
+        // Could be a dead constant test or another dead variant (e.g. a Phi with 2 inputs created with split_thru_phi).
+        // Either way, skip this test.
+        continue;
       }
       if (!bol->is_Bool()) {
         assert(bol->is_Opaque4() || bol->is_OpaqueInitializedAssertionPredicate(),
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestIfWithPhiInput.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestIfWithPhiInput.java
new file mode 100644
index 00000000000..a2f481fa73d
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestIfWithPhiInput.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8333394
+ * @summary Test bailout of range check policy with an If with a Phi as condition.
+ * @run main/othervm -XX:CompileCommand=compileonly,*TestIfWithPhiInput*::* -Xcomp -XX:-TieredCompilation
+ *                   compiler.predicates.assertion.TestIfWithPhiInput
+ */
+
+package compiler.predicates.assertion;
+
+public class TestIfWithPhiInput {
+    static int x;
+    static int y;
+
+    public static void main(String[] strArr) {
+        test();
+    }
+
+    static int test() {
+        int i = 1;
+        do {
+            try {
+                y = y / y;
+            } catch (ArithmeticException a_e) {
+            }
+            for (int j = i; j < 6; j++) {
+                y = i;
+            }
+        } while (++i < 52);
+        return x;
+    }
+}