RFR: Fix x86_64 non-PCH build
Aleksey Shipilev
shade at redhat.com
Wed Jun 6 08:25:24 UTC 2018
Current non-PCH build fails with:
/pool/buildbot/slaves/sobornost/shenandoah-jdkX/build/src/hotspot/share/runtime/javaFrameAnchor.hpp:43:14:
note: forward declaration of ‘class StubAssembler’
friend class StubAssembler;
^~~~~~~~~~~~~
/pool/buildbot/slaves/sobornost/shenandoah-jdkX/build/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp:773:16:
error: invalid use of incomplete type ‘class StubAssembler’
#define __ sasm->
^
/pool/buildbot/slaves/sobornost/shenandoah-jdkX/build/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp:828:3:
note: in expansion of macro ‘__’
__ epilogue();
^~
Fix:
diff -r a02ecef8a161 src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Tue Jun 05 19:29:25
2018 -0400
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Wed Jun 06 10:24:07
2018 +0200
@@ -32,6 +32,12 @@
#include "interpreter/interp_masm.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/thread.hpp"
+#include "utilities/macros.hpp"
+#ifdef COMPILER1
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
+#endif
#define __ masm->
Testing: x86_64 non-PCH build
Thanks,
-Aleksey
More information about the shenandoah-dev
mailing list