RFR (XS) 8223637: PPC64 and S390X build failures after 8223136 (Move compressed oops functions to CompressedOops class)

[Stefan Karlsson]

On 2019-05-10 13:16, John Paul Adrian Glaubitz wrote:
> Hi!
> 
> On 5/10/19 1:07 PM, Schmidt, Lutz wrote:
>> you may want to try the additional changes I suggested in my response at 12:09pm (CET).
> Okay, I now have:
> 
> diff -r 45bbef01a6ae src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp
> --- a/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp      Fri May 10 09:56:20 2019 +0200
> +++ b/src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp      Fri May 10 14:13:29 2019 +0300
> @@ -29,6 +29,7 @@
>   #include "c1/c1_LIRAssembler.hpp"
>   #include "c1/c1_MacroAssembler.hpp"
>   #include "c1/c1_Runtime1.hpp"
> +#include "memory/universe.hpp"
>   #include "nativeInst_sparc.hpp"
>   #include "runtime/sharedRuntime.hpp"
>   #include "utilities/macros.hpp"
> diff -r 45bbef01a6ae src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp
> --- a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp   Fri May 10 09:56:20 2019 +0200
> +++ b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp   Fri May 10 14:13:29 2019 +0300
> @@ -34,6 +34,7 @@
>   #include "gc/shared/barrierSet.hpp"
>   #include "gc/shared/cardTableBarrierSet.hpp"
>   #include "gc/shared/collectedHeap.hpp"
> +#include "memory/universe.hpp"
>   #include "nativeInst_sparc.hpp"
>   #include "oops/objArrayKlass.hpp"
>   #include "runtime/frame.inline.hpp"
> diff -r 45bbef01a6ae src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
> --- a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp     Fri May 10 09:56:20 2019 +0200
> +++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp     Fri May 10 14:13:29 2019 +0300
> @@ -29,6 +29,7 @@
>   #include "asm/macroAssembler.hpp"
>   #include "asm/codeBuffer.hpp"
>   #include "code/codeCache.hpp"
> +#include "oops/compressedOops.hpp"
>   
>   inline bool Address::is_simm13(int offset) { return Assembler::is_simm13(disp() + offset); }
>   
> diff -r 45bbef01a6ae src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.cpp
> --- a/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.cpp     Fri May 10 09:56:20 2019 +0200
> +++ b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.cpp     Fri May 10 14:13:29 2019 +0300
> @@ -24,6 +24,7 @@
>   
>   #include "precompiled.hpp"
>   #include "memory/metaspaceShared.hpp"
> +#include "memory/universe.hpp"
>   #include "runtime/frame.inline.hpp"
>   #include "runtime/thread.inline.hpp"
>   
> diff -r 45bbef01a6ae src/hotspot/share/adlc/main.cpp
> --- a/src/hotspot/share/adlc/main.cpp   Fri May 10 09:56:20 2019 +0200
> +++ b/src/hotspot/share/adlc/main.cpp   Fri May 10 14:13:29 2019 +0300
> @@ -217,6 +217,7 @@
>     AD.addInclude(AD._CPP_file, "code/vmreg.inline.hpp");
>     AD.addInclude(AD._CPP_file, "gc/shared/collectedHeap.inline.hpp");
>     AD.addInclude(AD._CPP_file, "oops/compiledICHolder.hpp");
> +  AD.addInclude(AD._CPP_file, "oops/compressedOops.hpp");
>     AD.addInclude(AD._CPP_file, "oops/markOop.hpp");
>     AD.addInclude(AD._CPP_file, "oops/method.hpp");
>     AD.addInclude(AD._CPP_file, "oops/oop.inline.hpp");
> @@ -239,6 +240,7 @@
>     AD.addInclude(AD._HPP_file, "opto/regalloc.hpp");
>     AD.addInclude(AD._HPP_file, "opto/subnode.hpp");
>     AD.addInclude(AD._HPP_file, "opto/vectornode.hpp");
> +  AD.addInclude(AD._CPP_EXPAND_file, "oops/compressedOops.hpp");
>     AD.addInclude(AD._CPP_CLONE_file, "precompiled.hpp");
>     AD.addInclude(AD._CPP_CLONE_file, "adfiles", get_basename(AD._HPP_file._name));
>     AD.addInclude(AD._CPP_EXPAND_file, "precompiled.hpp");
> @@ -257,6 +259,7 @@
>     AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name));
>     AD.addInclude(AD._DFA_file, "precompiled.hpp");
>     AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name));
> +  AD.addInclude(AD._DFA_file, "oops/compressedOops.hpp");
>     AD.addInclude(AD._DFA_file, "opto/cfgnode.hpp");  // Use PROB_MAX in predicate.
>     AD.addInclude(AD._DFA_file, "opto/intrinsicnode.hpp");
>     AD.addInclude(AD._DFA_file, "opto/matcher.hpp");
> glaubitz at gcc202:~/jdk$
> 
> But I still get:
> 
> make[3]: *** [lib/CompileJvm.gmk:177: /home/glaubitz/jdk/build/linux-sparcv9-server-release/hotspot/variant-server/libjvm/objs/ad_sparc_expand.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
> /bin/sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$//' -e 's/^[         ]*//' -e '/^$/ d' -e 's/$/ :/'  /home/glaubitz/jdk/build/linux-sparcv9-server-release/hotspot/variant-server/libjvm/objs/annotations.d > /home/glaubitz/jdk/build/linux-sparcv9-server-release/hotspot/variant-server/libjvm/objs/annotations.d.targets
> In file included from ad_sparc.cpp:29:
> ad_sparc.hpp: In member function ‘virtual int encodeHeapOopNode::ins_avoid_back_to_back() const’:
> ad_sparc.hpp:7247:66: error: ‘CompressedOops’ has not been declared
> ad_sparc.hpp: In constructor ‘encodeHeapOopNode::encodeHeapOopNode()’:
> ad_sparc.hpp:7252:76: error: ‘CompressedOops’ has not been declared
> /bin/sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$//' -e 's/^[         ]*//' -e '/^$/ d' -e 's/$/ :/'  /home/glaubitz/jdk/build/linux-sparcv9-server-release/hotspot/variant-server/libjvm/objs/arena.d > /home/glaubitz/jdk/build/linux-sparcv9-server-release/hotspot/variant-server/libjvm/objs/arena.d.targets
> /bin/sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$//' -e 's/^[         ]*//' -e '/^$/ d' -e 's/$/ :/'  /home/glaubitz/jdk/build/linux-sparcv9-server-release/hotspot/variant-server/libjvm/objs/accessBackend.d > /home/glaubitz/jdk/build/linux-sparcv9-server-release/hotspot/variant-server/libjvm/objs/accessBackend.d.targets
> In file included from ad_sparc_pipeline.cpp:28:
> ad_sparc.hpp: In member function ‘virtual int encodeHeapOopNode::ins_avoid_back_to_back() const’:
> ad_sparc.hpp:7247:66: error: ‘CompressedOops’ has not been declared
> ad_sparc.hpp: In constructor ‘encodeHeapOopNode::encodeHeapOopNode()’:
> ad_sparc.hpp:7252:76: error: ‘CompressedOops’ has not been declared

Do you need a line for the AD.__HPP_file ?

    AD.addInclude(AD._HPP_file, "oops/compressedOops.hpp");

StefanK

> 
> Adrian
>