Skip to content

Commit 3949b0f

Browse files
8371674: C2 fails with Missed optimization opportunity in PhaseIterGVN for MoveL2D
Reviewed-by: epeter, chagedorn
1 parent f0afd89 commit 3949b0f

File tree

2 files changed

+66
-2
lines changed

2 files changed

+66
-2
lines changed

src/hotspot/share/opto/node.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,9 +1209,12 @@ bool Node::has_special_unique_user() const {
12091209
if (this->is_Store()) {
12101210
// Condition for back-to-back stores folding.
12111211
return n->Opcode() == op && n->in(MemNode::Memory) == this;
1212-
} else if (this->is_Load() || this->is_DecodeN() || this->is_Phi()) {
1212+
} else if ((this->is_Load() || this->is_DecodeN() || this->is_Phi()) && n->Opcode() == Op_MemBarAcquire) {
12131213
// Condition for removing an unused LoadNode or DecodeNNode from the MemBarAcquire precedence input
1214-
return n->Opcode() == Op_MemBarAcquire;
1214+
return true;
1215+
} else if (this->is_Load() && n->is_Move()) {
1216+
// Condition for MoveX2Y (LoadX mem) => LoadY mem
1217+
return true;
12151218
} else if (op == Op_AddL) {
12161219
// Condition for convL2I(addL(x,y)) ==> addI(convL2I(x),convL2I(y))
12171220
return n->Opcode() == Op_ConvL2I && n->in(1) == this;
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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 8371674
27+
* @summary An expression of the form "MoveX2Y (LoadX mem)" should be
28+
* transformed into "LoadY mem". This test ensures that changes
29+
* to the number of users of the Load node propagate as expected
30+
* and that the optimization is not missed.
31+
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Xcomp
32+
* -XX:CompileCommand=compileonly,compiler.c2.TestMissingOptMoveX2YLoadX::test*
33+
* -XX:VerifyIterativeGVN=1110 compiler.c2.TestMissingOptMoveX2YLoadX
34+
* @run main compiler.c2.TestMissingOptMoveX2YLoadX
35+
*
36+
*/
37+
38+
package compiler.c2;
39+
40+
public class TestMissingOptMoveX2YLoadX {
41+
static final int N = 400;
42+
static volatile long b;
43+
44+
public static void main(String[] strArr) {
45+
// could theoretically happen with other variants of MoveNode
46+
// but there is no known reproducer for the other cases
47+
Double.longBitsToDouble(0l);
48+
testMoveL2D();
49+
}
50+
51+
static void testMoveL2D() {
52+
int e = 8, f, g = 9, h = 2, i[] = new int[N];
53+
long j[] = new long[N];
54+
while (++e < 37) {
55+
for (f = 1; f < 7; f++) {
56+
h >>>= (int)(--g - Double.longBitsToDouble(j[e]));
57+
b -= b;
58+
}
59+
}
60+
}
61+
}

0 commit comments

Comments
 (0)