commit 53c6887a3d167f9c0d72b3a5e6580ef63eec68fa
author Yumin Qi <minqi@openjdk.org> Tue Mar 10 14:37:37 2020 -0700
committer Yumin Qi <minqi@openjdk.org> Tue Mar 10 14:37:37 2020 -0700
tree 60a7ba747b941b88261821f242bbec8b3f92e929
parent 75632a6df200ff38bc0a1f9b0a35e156f90222e6

8240840: Rollback whitebox.cpp in push 8240691

Whitebox.cpp should not change in 8240691, which is accidentally included.

Reviewed-by: iklam, ccheung

src/hotspot/share/prims/whitebox.cpp

diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 0e0b7a6..690f093 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1990,6 +1990,12 @@
 
 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;