stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189101: AARCH32 - 'minimal' build fails because CMS bits are referred unconditionally

Browse Source 
Reviewed-by: shade, dholmes
This commit is contained in:
Boris Ulasevich 2018-04-11 20:56:56 +03:00 committed by Dmitrij Pochepko
parent 2a0986b882
commit c130c8137f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
View File

@ -533,9 +533,11 @@ void LIRGenerator::CardTableBarrierSet_post_barrier_helper(LIR_OprDesc* addr, LI
set_card(tmp, card_addr);
__ branch_destination(L_already_dirty->label());
} else {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
__ membar_storestore();
}
#endif
set_card(tmp, card_addr);
}
}

4
src/hotspot/cpu/arm/interp_masm_arm.cpp
View File

@ -450,9 +450,11 @@ void InterpreterMacroAssembler::store_check_part2(Register obj, Register card_ta
#endif
if (UseCondCardMark) {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC) {
membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), noreg);
}
#endif
Label already_dirty;
ldrb(tmp, card_table_addr);
@ -462,9 +464,11 @@ void InterpreterMacroAssembler::store_check_part2(Register obj, Register card_ta
bind(already_dirty);
} else {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore), noreg);
}
#endif
set_card(card_table_base, card_table_addr, tmp);
}
}