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

Merge

Browse Source
This commit is contained in:
Erik Österlund 2017-07-14 13:43:12 +02:00
commit b8c23151e8
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
View File

@ -203,26 +203,15 @@ void CompilerToVM::Data::initialize(TRAPS) {
symbol_clinit = (address) vmSymbols::class_initializer_name(); symbol_clinit = (address) vmSymbols::class_initializer_name();
BarrierSet* bs = Universe::heap()->barrier_set(); BarrierSet* bs = Universe::heap()->barrier_set();
switch (bs->kind()) { if (bs->is_a(BarrierSet::CardTableModRef)) {
case BarrierSet::CardTableModRef:
case BarrierSet::CardTableForRS:
case BarrierSet::CardTableExtension:
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging: {
jbyte* base = barrier_set_cast<CardTableModRefBS>(bs)->byte_map_base; jbyte* base = barrier_set_cast<CardTableModRefBS>(bs)->byte_map_base;
assert(base != 0, "unexpected byte_map_base"); assert(base != 0, "unexpected byte_map_base");
cardtable_start_address = base; cardtable_start_address = base;
cardtable_shift = CardTableModRefBS::card_shift; cardtable_shift = CardTableModRefBS::card_shift;
break; } else {
} // No card mark barriers
case BarrierSet::ModRef:
cardtable_start_address = 0; cardtable_start_address = 0;
cardtable_shift = 0; cardtable_shift = 0;
// No post barriers
break;
default:
JVMCI_ERROR("Unsupported BarrierSet kind %d", bs->kind());
break;
} }
vm_page_size = os::vm_page_size(); vm_page_size = os::vm_page_size();