8211100: hotspot C1 issue with comparing long numbers on x86 32-bit

Reviewed-by: iveresov, thartmann
This commit is contained in:
Dmitry Cherepanov 2019-03-20 11:51:43 +03:00
parent 42b8e78a7a
commit f16af8d4d5
2 changed files with 59 additions and 0 deletions
src/hotspot/share/c1
test/hotspot/jtreg/compiler/c1

@ -3279,7 +3279,14 @@ void LIRGenerator::do_ProfileInvoke(ProfileInvoke* x) {
void LIRGenerator::increment_backedge_counter_conditionally(LIR_Condition cond, LIR_Opr left, LIR_Opr right, CodeEmitInfo* info, int left_bci, int right_bci, int bci) {
if (compilation()->count_backedges()) {
#if defined(X86) && !defined(_LP64)
// BEWARE! On 32-bit x86 cmp clobbers its left argument so we need a temp copy.
LIR_Opr left_copy = new_register(left->type());
__ move(left, left_copy);
__ cmp(cond, left_copy, right);
#else
__ cmp(cond, left, right);
#endif
LIR_Opr step = new_register(T_INT);
LIR_Opr plus_one = LIR_OprFact::intConst(InvocationCounter::count_increment);
LIR_Opr zero = LIR_OprFact::intConst(0);

@ -0,0 +1,52 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. 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 8211100
* @summary hotspot C1 issue with comparing long numbers on x86 32-bit
*
* @run main/othervm -XX:+PrintCompilation -XX:CompileOnly=compiler.c1.Test8211100::test
* -XX:CompileCommand=quiet compiler.c1.Test8211100
*/
package compiler.c1;
public class Test8211100 {
private static final int ITERATIONS = 100_000;
public static void main(String[] args) {
for (int i = 0; i < ITERATIONS; i++) {
test(4558828911L,
4294967296L);
}
}
private static void test(long one, long two) {
while (true) {
if (one >= two) {
break;
}
}
}
}