From 53c6887a3d167f9c0d72b3a5e6580ef63eec68fa Mon Sep 17 00:00:00 2001
From: Yumin Qi <minqi@openjdk.org>
Date: Tue, 10 Mar 2020 14:37:37 -0700
Subject: [PATCH] 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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 0e0b7a65653..690f0933002 100644
--- 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;