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

8239477: jdk/jfr/jcmd/TestJcmdStartStopDefault.java fails -XX:+VerifyOops with "verify_oop: rsi: broken oop"

Browse source 
Use T_ADDRESS instead of T_OBJECT to load metadata.

Reviewed-by: kvn
This commit is contained in:
Tobias Hartmann 2020-06-02 10:00:40 +02:00
parent f822eed55c
commit b5775c831d
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/hotspot/share/c1/c1_LIRGenerator.cpp
View file

@ -2975,16 +2975,18 @@ void LIRGenerator::do_ClassIDIntrinsic(Intrinsic* x) {
void LIRGenerator::do_getEventWriter(Intrinsic* x) { void LIRGenerator::do_getEventWriter(Intrinsic* x) {
LabelObj* L_end = new LabelObj(); LabelObj* L_end = new LabelObj();
// FIXME T_ADDRESS should actually be T_METADATA but it can't because the
// meaning of these two is mixed up (see JDK-8026837).
LIR_Address* jobj_addr = new LIR_Address(getThreadPointer(), LIR_Address* jobj_addr = new LIR_Address(getThreadPointer(),
in_bytes(THREAD_LOCAL_WRITER_OFFSET_JFR), in_bytes(THREAD_LOCAL_WRITER_OFFSET_JFR),
T_OBJECT); T_ADDRESS);
LIR_Opr result = rlock_result(x); LIR_Opr result = rlock_result(x);
__ move_wide(jobj_addr, result); __ move(LIR_OprFact::oopConst(NULL), result);
__ cmp(lir_cond_equal, result, LIR_OprFact::oopConst(NULL)); LIR_Opr jobj = new_register(T_METADATA);
__ move_wide(jobj_addr, jobj);
__ cmp(lir_cond_equal, jobj, LIR_OprFact::metadataConst(0));
__ branch(lir_cond_equal, L_end->label()); __ branch(lir_cond_equal, L_end->label());
LIR_Opr jobj = new_register(T_OBJECT);
__ move(result, jobj);
access_load(IN_NATIVE, T_OBJECT, LIR_OprFact::address(new LIR_Address(jobj, T_OBJECT)), result); access_load(IN_NATIVE, T_OBJECT, LIR_OprFact::address(new LIR_Address(jobj, T_OBJECT)), result);
__ branch_destination(L_end->label()); __ branch_destination(L_end->label());