From ba5ccc8220f6951a1a6d787b95aec7c32e9ebefb Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Wed, 7 Mar 2018 10:58:59 +0100 Subject: [PATCH] 8199219: Build failures after JDK-8195148 (Collapse G1SATBCardTableModRefBS and G1SATBCardTableLoggingModRefBS into a single G1BarrierSet) Reviewed-by: dholmes --- src/hotspot/cpu/x86/stubGenerator_x86_32.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp index 0440467b7e1..96adee69644 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp @@ -678,6 +678,7 @@ class StubGenerator: public StubCodeGenerator { 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 @@ class StubGenerator: public StubCodeGenerator { BarrierSet* bs = Universe::heap()->barrier_set(); assert_different_registers(start, count); switch (bs->kind()) { +#if INCLUDE_ALL_GCS case BarrierSet::G1BarrierSet: { __ pusha(); // push registers