8330631: Lilliput: Modify runtime/CompressedOops/CompressedClassPointers for tinycp

Reviewed-by: stefank, stuefe

Author: rkennke

src/hotspot/share/oops/compressedKlass.cpp

@@ -186,17 +186,11 @@ char* CompressedKlassPointers::reserve_address_space_X(uintptr_t from, uintptr_t
 }
 
 char* CompressedKlassPointers::reserve_address_space_for_unscaled_encoding(size_t size, bool aslr) {
-  if (tiny_classpointer_mode()) {
-    return nullptr;
-  }
   const size_t unscaled_max = nth_bit(narrow_klass_pointer_bits());
   return reserve_address_space_X(0, unscaled_max, size, Metaspace::reserve_alignment(), aslr);
 }
 
 char* CompressedKlassPointers::reserve_address_space_for_zerobased_encoding(size_t size, bool aslr) {
-  if (tiny_classpointer_mode()) {
-    return nullptr;
-  }
   const size_t unscaled_max = nth_bit(narrow_klass_pointer_bits());
   const size_t zerobased_max = nth_bit(narrow_klass_pointer_bits() + max_shift());
   return reserve_address_space_X(unscaled_max, zerobased_max, size, Metaspace::reserve_alignment(), aslr);

test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java

@@ -46,6 +46,7 @@ public class CompressedClassPointers {
 
     static final String logging_option = "-Xlog:gc+metaspace=trace,metaspace=info,cds=trace";
     static final String reserveCCSAnywhere = "Reserving compressed class space anywhere";
+    static final String usesCompactObjectHeadersPat = "UseCompactObjectHeaders 1";
 
     // Returns true if we are to test the narrow klass base; we only do this on
     // platforms where we can be reasonably shure that we get reproducable placement).
@@ -57,6 +58,11 @@ static boolean testNarrowKlassBase() {
 
     }
 
+    // Returns true if the output indicates that the VM uses compact object headers
+    static boolean usesCompactObjectHeaders(OutputAnalyzer output) {
+        return output.getOutput().contains(usesCompactObjectHeadersPat);
+    }
+
     // Returns true if the output indicates that the ccs is reserved anywhere.
     static boolean isCCSReservedAnywhere(OutputAnalyzer output) {
         if (output.getOutput().contains(reserveCCSAnywhere)) {
@@ -221,7 +227,7 @@ public static void smallHeapTestNoCoop() throws Exception {
             "-Xlog:cds=trace",
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        if (!isCCSReservedAnywhere(output)) {
+        if (!isCCSReservedAnywhere(output) && !usesCompactObjectHeaders(output)) {
             output.shouldContain("Narrow klass base: 0x0000000000000000");
         }
         output.shouldHaveExitValue(0);
@@ -239,10 +245,10 @@ public static void smallHeapTestWith1GNoCoop() throws Exception {
             "-Xlog:cds=trace",
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        if (!isCCSReservedAnywhere(output)) {
+        if (!isCCSReservedAnywhere(output) && !usesCompactObjectHeaders(output)) {
             output.shouldContain("Narrow klass base: 0x0000000000000000");
         }
-        if (!Platform.isAArch64() && !Platform.isPPC()) {
+        if (!Platform.isAArch64()  && !usesCompactObjectHeaders(output) && !Platform.isPPC()) {
             // Currently relax this test for Aarch64 and ppc.
             output.shouldContain("Narrow klass shift: 0");
         }
@@ -261,10 +267,10 @@ public static void largeHeapTestNoCoop() throws Exception {
             "-Xlog:cds=trace",
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        if (!isCCSReservedAnywhere(output)) {
+        if (!isCCSReservedAnywhere(output) && !usesCompactObjectHeaders(output)) {
             output.shouldContain("Narrow klass base: 0x0000000000000000");
         }
-        if (!Platform.isAArch64() && !Platform.isPPC()) {
+        if (!Platform.isAArch64()  && !usesCompactObjectHeaders(output) && !Platform.isPPC()) {
             // Currently relax this test for Aarch64 and ppc.
             output.shouldContain("Narrow klass shift: 0");
         }