--- a/src/hotspot/share/prims/whitebox.cpp	Tue Dec 19 06:29:17 2017 -0500
+++ b/src/hotspot/share/prims/whitebox.cpp	Mon Dec 04 08:59:47 2017 -0800
@@ -1727,10 +1727,16 @@
 
 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;
-#endif
+#endif // INCLUDE_CDS
 WB_END