Skip to content

Commit c75df63

Browse files
benoitmaillardeme64
authored andcommitted
8359602: Ideal optimizations depending on input type are missed because of missing notification mechanism from CCP
Reviewed-by: epeter, thartmann
1 parent fd13e1c commit c75df63

File tree

2 files changed

+61
-0
lines changed

2 files changed

+61
-0
lines changed

src/hotspot/share/opto/phaseX.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3121,6 +3121,7 @@ Node *PhaseCCP::transform_once( Node *n ) {
31213121
hash_delete(n); // changing bottom type may force a rehash
31223122
n->raise_bottom_type(t);
31233123
_worklist.push(n); // n re-enters the hash table via the worklist
3124+
add_users_to_worklist(n); // if ideal or identity optimizations depend on the input type, users need to be notified
31243125
}
31253126

31263127
// TEMPORARY fix to ensure that 2nd GVN pass eliminates null checks
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/*
25+
* @test
26+
* @bug 8359602
27+
* @summary The control input of a ModI node should be discarded if it is
28+
* possible to prove that the divisor can never be 0.
29+
* VerifyIterativeGVN checks that this optimization was applied
30+
* @run main/othervm -XX:CompileCommand=quiet -XX:-TieredCompilation
31+
* -XX:+UnlockDiagnosticVMOptions -Xcomp -XX:+IgnoreUnrecognizedVMOptions
32+
* -XX:CompileCommand=compileonly,compiler.c2.TestModControlFoldedAfterCCP::test
33+
* -XX:VerifyIterativeGVN=1110 compiler.c2.TestModControlFoldedAfterCCP
34+
* @run main compiler.c2.TestModControlFoldedAfterCCP
35+
*
36+
*/
37+
38+
package compiler.c2;
39+
40+
public class TestModControlFoldedAfterCCP {
41+
static void test() {
42+
int i22, i24 = -1191, i28;
43+
int iArr1[] = new int[1];
44+
for (int i = 1;i < 100; i++) {
45+
for (int j = 4; j > i; j--) {
46+
i22 = i24;
47+
48+
// divisor is either -1191 or -13957
49+
iArr1[0] = 5 % i22;
50+
}
51+
for (i28 = i; i28 < 2; ++i28) {
52+
i24 = -13957;
53+
}
54+
}
55+
}
56+
57+
public static void main(String[] args) {
58+
test();
59+
}
60+
}

0 commit comments

Comments
 (0)