8263352: assert(use == polladr) failed: the use should be a safepoint…

… polling

Co-authored-by: Wang Huang <whuang@openjdk.org>
Co-authored-by: Wu Yan <wuyan34@huawei.com>
Reviewed-by: kvn

src/hotspot/share/opto/loopTransform.cpp

@@ -3705,17 +3705,15 @@ bool PhaseIdealLoop::match_fill_loop(IdealLoopTree* lpt, Node*& store, Node*& st
           // In strip-mined counted loops, the CountedLoopNode may be
           // used by the address polling node of the outer safepoint.
           // Skip this use because it's safe.
-#ifdef ASSERT
           Node* sfpt = n->as_CountedLoop()->outer_safepoint();
           Node* polladr = sfpt->in(TypeFunc::Parms+0);
-          assert(use == polladr, "the use should be a safepoint polling");
-#endif
-          continue;
-        } else {
-          msg = "node is used outside loop";
-          msg_node = n;
-          break;
+          if (use == polladr) {
+            continue;
+          }
         }
+        msg = "node is used outside loop";
+        msg_node = n;
+        break;
       }
     }
   }

test/hotspot/jtreg/compiler/loopopts/TestOptimizeFillWithStripMinedLoop.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. 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 8263352
+ * @summary assert(use == polladr) failed: the use should be a safepoint polling
+ * @requires vm.flavor == "server"
+ *
+ * @run main/othervm -XX:-BackgroundCompilation -XX:+OptimizeFill
+ *                   compiler.loopopts.TestOptimizeFillWithStripMinedLoop
+ *
+ */
+
+package compiler.loopopts;
+
+public class TestOptimizeFillWithStripMinedLoop {
+
+    class Wrap {
+      public int value;
+      public Wrap(int v) {
+        value = v;
+      }
+    }
+
+    public static int size = 1024;
+    public static int[] ia = new int[size];
+
+    public static void main(String[] args) throws Exception {
+      TestOptimizeFillWithStripMinedLoop m = new TestOptimizeFillWithStripMinedLoop();
+      m.test();
+    }
+
+    public void test() throws Exception {
+      for(int i = 0; i < 20_000; i++) {
+        Wrap obj = null;
+        if (i % 113 != 0) {
+          obj = new Wrap(i);
+        }
+        foo(obj);
+      }
+    }
+
+    public int foo(Wrap obj) throws Exception {
+        boolean condition = false;
+        int first = -1;
+
+        if (obj == null) {
+          condition = true;
+          first = 24;
+        }
+
+        for (int i = 0; i < size; i++) {
+            ia[i] = condition ? first : obj.value;
+        }
+        return 0;
+    }
+}