Skip to content

Commit d3a5ed2

Browse files
Adam FarleyTheRealMDoerr
authored andcommitted
8267773: PhaseStringOpts::int_stringSize doesn't handle min_jint correctly
Backport-of: d47a77d
1 parent f55ef1e commit d3a5ed2

File tree

2 files changed

+65
-0
lines changed

2 files changed

+65
-0
lines changed

src/hotspot/share/opto/stringopts.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,11 @@ Node* PhaseStringOpts::int_stringSize(GraphKit& kit, Node* arg) {
11491149
int arg_val = arg->get_int();
11501150
int count = 1;
11511151
if (arg_val < 0) {
1152+
// Special case for min_jint - it can't be negated.
1153+
if (arg_val == min_jint) {
1154+
return __ intcon(11);
1155+
}
1156+
11521157
arg_val = -arg_val;
11531158
count++;
11541159
}
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright (c) 2021, Red Hat, Inc. 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 8267773
27+
* @summary Test
28+
*
29+
* @compile IntegerMinValue.java
30+
* @run main/othervm -Xverify:all -Xbatch IntegerMinValue
31+
*
32+
* @compile -XDstringConcat=inline IntegerMinValue.java
33+
* @run main/othervm -Xverify:all -Xbatch IntegerMinValue
34+
*
35+
* @compile -XDstringConcat=indy IntegerMinValue.java
36+
* @run main/othervm -Xverify:all -Xbatch IntegerMinValue
37+
*
38+
* @compile -XDstringConcat=indyWithConstants IntegerMinValue.java
39+
* @run main/othervm -Xverify:all -Xbatch IntegerMinValue
40+
*/
41+
42+
public class IntegerMinValue {
43+
44+
public void test() {
45+
int i = Integer.MIN_VALUE;
46+
String s = "" + i;
47+
if (!"-2147483648".equals(s)) {
48+
throw new IllegalStateException("Failed: " + s);
49+
}
50+
System.out.println(s);
51+
}
52+
53+
public static void main(String[] strArr) {
54+
IntegerMinValue t = new IntegerMinValue();
55+
for (int i = 0; i < 100_000; i++ ) {
56+
t.test();
57+
}
58+
}
59+
60+
}

0 commit comments

Comments
 (0)