infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-05 13:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

8011901: Unsafe.getAndAddLong(obj, off, delta) does not work properly with long deltas

Browse Source 
Instruct xaddL_no_res shouldn't allow 64 bit constants.

Reviewed-by: kvn
This commit is contained in:
Roland Westrelin 2013-04-16 17:06:39 +02:00
parent 94d9107a7b
commit bad6728ea4
2 changed files with 69 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hotspot/src/cpu/x86/vm/x86_64.ad
View File

@ -2222,12 +2222,6 @@ encode %{
$$$emit32$src$$constant;
%}
enc_class Con64(immL src)
%{
// Output immediate
emit_d64($src$$constant);
%}
enc_class Con32F_as_bits(immF src)
%{
// Output Float immediate bits
@ -7608,7 +7602,7 @@ instruct xaddI( memory mem, rRegI newval, rFlagsReg cr) %{
ins_pipe( pipe_cmpxchg );
%}
instruct xaddL_no_res( memory mem, Universe dummy, immL add, rFlagsReg cr) %{
instruct xaddL_no_res( memory mem, Universe dummy, immL32 add, rFlagsReg cr) %{
predicate(n->as_LoadStore()->result_not_used());
match(Set dummy (GetAndAddL mem add));
effect(KILL cr);

68
hotspot/test/compiler/8011901/Test8011901.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Copyright (c) 2013, 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 8011901
* @summary instruct xaddL_no_res shouldn't allow 64 bit constants.
* @run main/othervm -XX:-BackgroundCompilation Test8011901
*
*/
import java.lang.reflect.*;
import sun.misc.*;
public class Test8011901 {
private long ctl;
private static final sun.misc.Unsafe U;
private static final long CTL;
static {
try {
Field unsafe = sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
unsafe.setAccessible(true);
U = (sun.misc.Unsafe) unsafe.get(null);
CTL = U.objectFieldOffset(Test8011901.class.getDeclaredField("ctl"));
} catch (Exception e) {
throw new Error(e);
}
}
public static void main(String[] args) {
for(int c = 0; c < 20000; c++) {
new Test8011901().makeTest();
}
System.out.println("Test Passed");
}
public static final long EXPECTED = 1L << 42;
public void makeTest() {
U.getAndAddLong(this, CTL, EXPECTED);
if (ctl != EXPECTED) {
throw new RuntimeException("Test failed. Expected: " + EXPECTED + ", but got = " + ctl);
}
}
}