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

8139524: JVMCI cannot be initialized with CMS or Serial GCs

Browse Source 
Reviewed-by: iveresov
This commit is contained in:
Christian Thalinger 2015-10-13 09:21:10 -10:00
parent a138ebeb52
commit f1c801e561
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
View File

@ -86,13 +86,11 @@ public class HotSpotVMConfig {
final long barrierSetAddress = UNSAFE.getAddress(universeCollectedHeap + collectedHeapBarrierSetOffset);
final int kind = UNSAFE.getInt(barrierSetAddress + barrierSetFakeRttiOffset + fakeRttiConcreteTagOffset);
if ((kind == barrierSetCardTableModRef) || (kind == barrierSetCardTableExtension) || (kind == barrierSetG1SATBCT) || (kind == barrierSetG1SATBCTLogging)) {
if ((kind == barrierSetCardTableModRef) || (kind == barrierSetCardTableForRS) || (kind == barrierSetCardTableExtension) || (kind == barrierSetG1SATBCT) || (kind == barrierSetG1SATBCTLogging)) {
final long base = UNSAFE.getAddress(barrierSetAddress + cardTableModRefBSByteMapBaseOffset);
assert base != 0 : "unexpected byte_map_base: " + base;
cardtableStartAddress = base;
cardtableShift = cardTableModRefBSCardShift;
} else if (kind == barrierSetCardTableForRS) {
throw JVMCIError.unimplemented();
} else if (kind == barrierSetModRef) {
// No post barriers
cardtableStartAddress = 0;
@ -1708,8 +1706,8 @@ public class HotSpotVMConfig {
}
assert codeEntryAlignment > 0 : codeEntryAlignment;
assert(layoutHelperArrayTagObjectValue & (1 << (Integer.SIZE - 1))) != 0 : "object array must have first bit set";
assert(layoutHelperArrayTagTypeValue & (1 << (Integer.SIZE - 1))) != 0 : "type array must have first bit set";
assert (layoutHelperArrayTagObjectValue & (1 << (Integer.SIZE - 1))) != 0 : "object array must have first bit set";
assert (layoutHelperArrayTagTypeValue & (1 << (Integer.SIZE - 1))) != 0 : "type array must have first bit set";
return true;
}