RFR: [11] Fix non-PCH x86_32 build failure

Aleksey Shipilev shade at redhat.com
Wed Apr 25 08:21:31 UTC 2018


sh/jdk build fails like this:

/pool/buildbot/slaves/sobornost/shenandoah-jdkX/build/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp:557:19:
error: invalid use of incomplete type ‘class InterpreterMacroAssembler’
     NOT_LP64(imasm->save_bcp());
                   ^

Fix:

# HG changeset patch
# User shade
# Date 1524644415 -7200
#      Wed Apr 25 10:20:15 2018 +0200
# Node ID 2d2fbb98f9e9977b3ba649a9f4e58715dee4459d
# Parent  80116a580594a50526edfda9147d63223eb6170d
Fix non-PCH x86_32 build failure

diff -r 80116a580594 -r 2d2fbb98f9e9
src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp	Tue Apr 24 14:05:57
2018 +0200
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp	Wed Apr 25 10:20:15
2018 +0200
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
 #include "interpreter/interpreter.hpp"
+#include "interpreter/interp_masm.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.hpp"

Testing: x86_32 build

Thanks,
-Aleksey



More information about the shenandoah-dev mailing list