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

8199219: Build failures after JDK-8195148 (Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet)

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Aleksey Shipilev 2018-03-07 10:58:59 +01:00
parent bc202d97bd
commit ba5ccc8220
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
View File

@ -678,6 +678,7 @@ class StubGenerator: public StubCodeGenerator {
assert_different_registers(start, count); assert_different_registers(start, count);
BarrierSet* bs = Universe::heap()->barrier_set(); BarrierSet* bs = Universe::heap()->barrier_set();
switch (bs->kind()) { switch (bs->kind()) {
#if INCLUDE_ALL_GCS
case BarrierSet::G1BarrierSet: case BarrierSet::G1BarrierSet:
// With G1, don't generate the call if we statically know that the target in uninitialized // With G1, don't generate the call if we statically know that the target in uninitialized
if (!uninitialized_target) { if (!uninitialized_target) {
@ -727,6 +728,7 @@ class StubGenerator: public StubCodeGenerator {
BarrierSet* bs = Universe::heap()->barrier_set(); BarrierSet* bs = Universe::heap()->barrier_set();
assert_different_registers(start, count); assert_different_registers(start, count);
switch (bs->kind()) { switch (bs->kind()) {
#if INCLUDE_ALL_GCS
case BarrierSet::G1BarrierSet: case BarrierSet::G1BarrierSet:
{ {
__ pusha(); // push registers __ pusha(); // push registers