archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6849574: VM crash using NonBlockingHashMap (high_scale_lib)

Browse source 
Reviewed-by: kvn
This commit is contained in:
Tom Rodriguez 2009-06-10 12:19:48 -07:00
parent 7b9d6a79ac
commit 0f4f530213
3 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
View file

@ -371,7 +371,7 @@ void LIRGenerator::do_StoreIndexed(StoreIndexed* x) {
} }
__ move(value.result(), array_addr, null_check_info); __ move(value.result(), array_addr, null_check_info);
if (obj_store) { if (obj_store) {
// Is this precise? // Precise card mark
post_barrier(LIR_OprFact::address(array_addr), value.result()); post_barrier(LIR_OprFact::address(array_addr), value.result());
} }
} }
@ -685,11 +685,8 @@ void LIRGenerator::do_CompareAndSwap(Intrinsic* x, ValueType* type) {
LIR_Opr result = rlock_result(x); LIR_Opr result = rlock_result(x);
__ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0), result); __ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0), result);
if (type == objectType) { // Write-barrier needed for Object fields. if (type == objectType) { // Write-barrier needed for Object fields.
#ifdef PRECISE_CARDMARK // Precise card mark since could either be object or array
post_barrier(addr, val.result()); post_barrier(addr, val.result());
#else
post_barrier(obj.result(), val.result());
#endif // PRECISE_CARDMARK
} }
} }

6
hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
View file

@ -1534,12 +1534,8 @@ void LIRGenerator::do_StoreField(StoreField* x) {
} }
if (is_oop) { if (is_oop) {
#ifdef PRECISE_CARDMARK // Store to object so mark the card of the header
// Precise cardmarks don't work
post_barrier(LIR_OprFact::address(address), value.result());
#else
post_barrier(object.result(), value.result()); post_barrier(object.result(), value.result());
#endif // PRECISE_CARDMARK
} }
if (is_volatile && os::is_MP()) { if (is_volatile && os::is_MP()) {

44
hotspot/test/compiler/6849574/Test.java Normal file
View file

@ -0,0 +1,44 @@
/*
* Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*
*/
/**
* @test
* @bug 6849574
* @summary VM crash using NonBlockingHashMap (high_scale_lib)
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+VerifyBeforeGC Test
*/
import java.util.concurrent.atomic.*;
public class Test extends Thread {
public static void main(String[] args) {
AtomicReferenceArray a = new AtomicReferenceArray(10000);
for (int i = 0; i < 100000; i++) {
a.getAndSet(9999, new Object());
if (i > 99990) System.gc();
}
}
}