RFR: Fix build failure after "8230765: Implement nmethod barrier for x86_32 platforms"

Aleksey Shipilev shade at redhat.com
Sun Oct 20 18:58:48 UTC 2019


Current sh/jdk fails to build in the odd corner case: x86_32, minimal VM, fastdebug, PCH disabled:

$ CONF=linux-x86-minimal-fastdebug make images
Building target 'images' in configuration 'linux-x86-minimal-fastdebug'
Updating support/modules_libs/java.base/minimal/libjvm.so due to 5 file(s)
[buildjdk] Updating buildjdk/support/modules_libs/java.base/server/libjvm.so due to 3 file(s)
/home/shade/trunks/shenandoah-jdk/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp: In static member
function 'static AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler*, int,
int, const BasicType*, const VMRegPair*, AdapterFingerPrint*)':
/home/shade/trunks/shenandoah-jdk/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp:979:5: error: invalid
use of incomplete type 'class BarrierSetAssembler'
   bs->c2i_entry_barrier(masm);
     ^~

Fix:

diff -r c29454a99107 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp      Wed Oct 16 15:13:00 2019 -0400
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp      Sun Oct 20 20:58:26 2019 +0200
@@ -30,4 +30,6 @@
 #include "code/nativeInst.hpp"
 #include "code/vtableStubs.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "interpreter/interpreter.hpp"


Testing: failing build

Thanks,
-Aleksey



More information about the shenandoah-dev mailing list