RFR(xxs, trivial): 8201475: 8199417 breaks AIX and non-pch on s390 (and presumably aarch64)

Aleksey Shipilev shade at redhat.com
Thu Apr 12 07:57:09 UTC 2018


On 04/12/2018 07:36 AM, Thomas Stüfe wrote:
> http://cr.openjdk.java.net/~stuefe/webrevs/8201475-buildfix/webrev.00/webrev/
> 
> sharedRuntime.hpp was missing from the cpu specific files.
> 
> aarch64 looked broken too so I fixed it blindly, the fix seemed simple
> enough. Could aarch64 folks eye this over please?

Indeed, aarch64 is broken. Unfortunately, this fix is not enough:

/home/shade/jdk-hs/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp: In member function ‘void
InterpreterMacroAssembler::load_resolved_reference_at_index(Register, Register)’:
/home/shade/jdk-hs/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp:281:29: error: incomplete type
‘BarrierSet’ used in nested name specifier
   BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();

We need to add:

diff -r bdcfe8154201 src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp	Wed Mar 28 22:03:57 2018 +0200
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp	Thu Apr 12 09:56:18 2018 +0200
@@ -24,6 +24,7 @@
  */

 #include "precompiled.hpp"
+#include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "interp_masm_aarch64.hpp"
 #include "interpreter/interpreter.hpp"


Thanks!

-Aleksey


More information about the hotspot-dev mailing list