OpenJDK / jdk / jdk
changeset 49353:5f487b498e78
8199219: Build failures after JDK-8195148 (Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet)
Reviewed-by: dholmes
| author | shade |
|---|---|
| date | Wed, 07 Mar 2018 10:58:59 +0100 |
| parents | 0b48f0aa79ec |
| children | c6f2f91a1b4e |
| files | src/hotspot/cpu/x86/stubGenerator_x86_32.cpp |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Tue Mar 06 22:08:30 2018 -0800 +++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Wed Mar 07 10:58:59 2018 +0100 @@ -678,6 +678,7 @@ assert_different_registers(start, count); BarrierSet* bs = Universe::heap()->barrier_set(); switch (bs->kind()) { +#if INCLUDE_ALL_GCS case BarrierSet::G1BarrierSet: // With G1, don't generate the call if we statically know that the target in uninitialized if (!uninitialized_target) { @@ -727,6 +728,7 @@ BarrierSet* bs = Universe::heap()->barrier_set(); assert_different_registers(start, count); switch (bs->kind()) { +#if INCLUDE_ALL_GCS case BarrierSet::G1BarrierSet: { __ pusha(); // push registers