8271272: C2: assert(!had_error) failed: bad dominance

rwestrel · rwestrel · commit e351de3bd677 · 2021-07-30T07:28:04.000Z
Reviewed-by: kvn, thartmann, chagedorn
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
@@ -2045,7 +2045,7 @@ Node* CountedLoopNode::match_incr_with_optional_truncation(Node* expr, Node** tr
 }
 
 LoopNode* CountedLoopNode::skip_strip_mined(int expect_skeleton) {
-  if (is_strip_mined() && is_valid_counted_loop(T_INT)) {
+  if (is_strip_mined() && in(EntryControl) != NULL && in(EntryControl)->is_OuterStripMinedLoop()) {
     verify_strip_mined(expect_skeleton);
     return in(EntryControl)->as_Loop();
   }
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestMainNeverExecuted.java b/test/hotspot/jtreg/compiler/loopopts/TestMainNeverExecuted.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. 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 8271272
+ * @summary C2: assert(!had_error) failed: bad dominance
+ *
+ * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=TestMainNeverExecuted TestMainNeverExecuted
+ *
+ */
+
+public class TestMainNeverExecuted {
+    public static long y;
+    static int iArrFld[] = new int[400];
+    static long x = 0;
+
+    public static void main(String[] strArr) {
+        for (int i1 = 0; i1 < 100; i1++)
+            vMeth(3, 5);
+    }
+    static void vMeth(int f, int g) {
+        int i3 = 23;
+        int i11 = 2, i12 = 12, i13 = 32901, i14 = 43741;
+        for (i11 = 7; i11 < 325; ++i11) {
+            i13 = 1;
+            while ((i13 += 3) < 5) {
+                iArrFld[i13 - 1] = 906;
+                for (i14 = i13; i14 < 5; i14 += 2) {
+                    y += i14;
+                    i3 += i14;
+                }
+            }
+        }
+        x += i11 + i12 + i13 + i14;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2045,7 +2045,7 @@ Node* CountedLoopNode::match_incr_with_optional_truncation(Node* expr, Node** tr`
`2045`	`2045`	`}`
`2046`	`2046`
`2047`	`2047`	`LoopNode* CountedLoopNode::skip_strip_mined(int expect_skeleton) {`
`2048`		`- if (is_strip_mined() && is_valid_counted_loop(T_INT)) {`
	`2048`	`+ if (is_strip_mined() && in(EntryControl) != NULL && in(EntryControl)->is_OuterStripMinedLoop()) {`
`2049`	`2049`	`verify_strip_mined(expect_skeleton);`
`2050`	`2050`	`return in(EntryControl)->as_Loop();`
`2051`	`2051`	`}`