changeset 48445:d52bb1d8ae7b

8194914: Compilation fails with "node not on backedge" in OuterStripMinedLoopNode::adjust_strip_mined_loop Summary: Modified assert which is too strong. Reviewed-by: thartmann
author roland
date Mon, 15 Jan 2018 09:17:25 +0100
parents 9c022c19c960
children 0769bb301c7a
files src/hotspot/share/opto/loopnode.cpp test/hotspot/jtreg/compiler/loopstripmining/BackedgeNodeWithOutOfLoopControl.java
diffstat 2 files changed, 54 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/opto/loopnode.cpp	Sun Jan 14 16:42:47 2018 -0800
+++ b/src/hotspot/share/opto/loopnode.cpp	Mon Jan 15 09:17:25 2018 +0100
@@ -1331,8 +1331,7 @@
           n->set_req(i, old_new[n->in(i)->_idx]);
         }
       }
-      if (n->in(0) != NULL) {
-        assert(n->in(0) == cle_tail, "node not on backedge?");
+      if (n->in(0) != NULL && n->in(0) == cle_tail) {
         n->set_req(0, le_tail);
       }
       igvn->register_new_node_with_optimizer(n);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/loopstripmining/BackedgeNodeWithOutOfLoopControl.java	Mon Jan 15 09:17:25 2018 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018, 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 8194914
+ * @summary "node not on backedge" assert in OuterStripMinedLoopNode::adjust_strip_mined_loop
+ *
+ * @run main/othervm -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:-BackgroundCompilation -XX:+UseCountedLoopSafepoints -XX:LoopStripMiningIter=1000 BackedgeNodeWithOutOfLoopControl
+ *
+ */
+
+public class BackedgeNodeWithOutOfLoopControl {
+
+  public static void accessArrayVariables(int[] array, int i) {
+    for (int j = 0; j < 100000; j++) {
+      array[i-2]++;
+      array[i-1]++;
+    }
+  }
+
+  public void test() {
+    int[] array = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+    for (int i = 0; i < 2000; i++) {
+        accessArrayVariables(array, 5);
+    }
+  }
+
+  public static void main(String [] args) {
+      BackedgeNodeWithOutOfLoopControl aa = new BackedgeNodeWithOutOfLoopControl();
+      aa.test();
+  }
+}