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

[Schmidt, Lutz]

Hi Adrian,

it would be great if you could create a consolidated patch, based on http://cr.openjdk.java.net/~stefank/8223637/webrev.01/

plus your SPARC fixes plus what I found necessary:

--------------- 8< ----------------------
diff -r b0fbe518d143 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp        Fri May 10 09:41:14 2019 +0200
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp        Fri May 10 11:25:34 2019 +0200
@@ -32,7 +32,6 @@
#include "interpreter/interpreter.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_ppc.hpp"
-#include "oops/compressedOops.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/icache.hpp"
diff -r b0fbe518d143 src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp Fri May 10 09:41:14 2019 +0200
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp Fri May 10 11:25:34 2019 +0200
@@ -33,6 +33,7 @@
#include "gc/shared/barrierSet.hpp"
#include "gc/shared/barrierSetAssembler.hpp"
#include "oops/accessDecorators.hpp"
+#include "oops/compressedOops.hpp"
#include "runtime/safepointMechanism.hpp"
inline bool MacroAssembler::is_ld_largeoffset(address a) {
diff -r b0fbe518d143 src/hotspot/share/adlc/main.cpp
--- a/src/hotspot/share/adlc/main.cpp   Fri May 10 09:41:14 2019 +0200
+++ b/src/hotspot/share/adlc/main.cpp   Fri May 10 11:25:34 2019 +0200
@@ -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");
@@ -243,6 +244,7 @@
   AD.addInclude(AD._CPP_CLONE_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._CPP_EXPAND_file, "precompiled.hpp");
   AD.addInclude(AD._CPP_EXPAND_file, "adfiles", get_basename(AD._HPP_file._name));
+  AD.addInclude(AD._CPP_EXPAND_file, "oops/compressedOops.hpp");
   AD.addInclude(AD._CPP_FORMAT_file, "precompiled.hpp");
   AD.addInclude(AD._CPP_FORMAT_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._CPP_GEN_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");
----------- >8 ----------------------

Thanks,
Lutz

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

    On 5/10/19 4:36 PM, Schmidt, Lutz wrote:
    > Why wait? 
    > The changes discussed in this thread are sufficient to fix all platforms - at least as far as we know. Waiting too long means we lose the weekend for testing.
    
    Do you want me to send an updated patch for JDK-8223637 to include
    the fixes necessary for SPARC?
    
    Adrian
    
    -- 
     .''`.  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