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

[Schmidt, Lutz]

Hi,
anyone taking care of this issue? Stefan?
Thanks,
Lutz

On 10.05.19, 13:47, "John Paul Adrian Glaubitz" <glaubitz at physik.fu-berlin.de> wrote:

    Hi!
    
    On 5/10/19 1:34 PM, Stefan Karlsson wrote:
    >> Yes, getting further now:
    > 
    > This needs an:
    > #include "oops/oopsHierarchy.hpp" in compressedOops.hpp
    
    The following patch works. Not sure whether there are any redundant #includes
    now but I think the best is to wait for the other related fixes to be merged
    and then push something to fix linux-sparc. But if you want to include linux-sparc
    in your fix as well, please go ahead.
    
    glaubitz at gcc202:~/jdk$ hg diff
    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:41:37 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:41:37 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:41:37 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:41:37 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:41:37 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");
    @@ -233,12 +234,14 @@
       AD.addInclude(AD._CPP_file, "runtime/stubRoutines.hpp");
       AD.addInclude(AD._CPP_file, "utilities/growableArray.hpp");
       AD.addInclude(AD._HPP_file, "memory/allocation.hpp");
    +  AD.addInclude(AD._HPP_file, "oops/compressedOops.hpp");
       AD.addInclude(AD._HPP_file, "code/nativeInst.hpp");
       AD.addInclude(AD._HPP_file, "opto/machnode.hpp");
       AD.addInclude(AD._HPP_file, "opto/node.hpp");
       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 +260,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");
    diff -r 45bbef01a6ae src/hotspot/share/oops/compressedOops.hpp
    --- a/src/hotspot/share/oops/compressedOops.hpp Fri May 10 09:56:20 2019 +0200
    +++ b/src/hotspot/share/oops/compressedOops.hpp Fri May 10 14:41:37 2019 +0300
    @@ -26,6 +26,7 @@
     #define SHARE_OOPS_COMPRESSEDOOPS_HPP
     
     #include "memory/allocation.hpp"
    +#include "oops/oopsHierarchy.hpp"
     #include "utilities/globalDefinitions.hpp"
     
     class outputStream;
    glaubitz at gcc202:~/jdk$
    
    -- 
     .''`.  John Paul Adrian Glaubitz
    : :' :  Debian Developer - glaubitz at debian.org
    `. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
      `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913