RFR: 8199219: Build failures after JDK-8195148 (original) (raw)

David Holmes david.holmes at oracle.com
Wed Mar 7 09:55:19 UTC 2018

Reviewed!

I think this counts as trivial and can be pushed immediately.

Thanks, David

On 7/03/2018 7:47 PM, Aleksey Shipilev wrote:

x8632 build fails with:

src/hotspot/cpu/x86/stubGeneratorx8632.cpp:708:2: error: #endif without #if #endif // INCLUDEALLGCS ^~~~~ Bug: https://bugs.openjdk.java.net/browse/JDK-8199219 JDK-8195148 (G1 barrier set collapsing) change removed #if INCLUDEALLGCS from stubGeneratorx8632, but not in other arches: http://hg.openjdk.java.net/jdk/hs/rev/edb65305d3ac#l36.1 Reinstating it makes the x8632 build pass: diff -r 0b48f0aa79ec src/hotspot/cpu/x86/stubGeneratorx8632.cpp --- a/src/hotspot/cpu/x86/stubGeneratorx8632.cpp Tue Mar 06 22:08:30 2018 -0800 +++ b/src/hotspot/cpu/x86/stubGeneratorx8632.cpp Wed Mar 07 10:45:45 2018 +0100 @@ -678,6 +678,7 @@ assertdifferentregisters(start, count); BarrierSet* bs = Universe::heap()->barrierset(); switch (bs->kind()) { +#if INCLUDEALLGCS case BarrierSet::G1BarrierSet: // With G1, don't generate the call if we statically know that the target in uninitialized if (!uninitializedtarget) { @@ -727,6 +728,7 @@ BarrierSet* bs = Universe::heap()->barrierset(); assertdifferentregisters(start, count); switch (bs->kind()) { +#if INCLUDEALLGCS case BarrierSet::G1BarrierSet: { __ pusha(); // push registers_ Testing: x8632 build Thanks, -Aleksey

More information about the hotspot-dev mailing list