8240840: Rollback whitebox.cpp in push 8240691

Whitebox.cpp should not change in 8240691, which is accidentally included. Reviewed-by: iklam, ccheung
openjdk · Mar 10, 2020 · 53c6887 · 53c6887
1 parent 75632a6
commit 53c6887
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
@@ -1990,6 +1990,12 @@ WB_END
 
 WB_ENTRY(jboolean, WB_IsCDSIncludedInVmBuild(JNIEnv* env))
 #if INCLUDE_CDS
+# ifdef _LP64
+    if (!UseCompressedOops || !UseCompressedClassPointers) {
+      // On 64-bit VMs, CDS is supported only with compressed oops/pointers
+      return false;
+    }
+# endif // _LP64
   return true;
 #else
   return false;