From 1b7f511750d473ed7f7b6ea510312ab2ba513ac8 Mon Sep 17 00:00:00 2001
From: iveresov <unknown>
Date: Tue, 19 Oct 2010 11:14:52 -0700
Subject: [PATCH] 6989669: Coops: -Xshare:dump causes crash Summary:
 Temporarily fix to disable compressed oops with CDS Reviewed-by: dholmes,
 twisti, kvn, never

---
 src/share/vm/runtime/arguments.cpp | 7 +++++++
 src/share/vm/runtime/globals.hpp   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
index 2e1ac1e16..e996510bb 100644
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
@@ -2979,6 +2979,13 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
   UseCompressedOops = false;
 #endif
 
+#if defined(_LP64)
+  if ((DumpSharedSpaces || RequireSharedSpaces) && UseCompressedOops) {
+    // Disable compressed oops with shared spaces
+    UseCompressedOops = false;
+  }
+#endif
+
   // Set object alignment values.
   set_object_alignment();
 
diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
index 8395bf9a3..12e102185 100644
--- a/src/share/vm/runtime/globals.hpp
+++ b/src/share/vm/runtime/globals.hpp
@@ -3545,7 +3545,7 @@ class CommandLineFlags {
   product(uintx, SharedDummyBlockSize, 512*M,                               \
           "Size of dummy block used to shift heap addresses (in bytes)")    \
                                                                             \
-  product(uintx, SharedReadWriteSize,  12*M,                                \
+  product(uintx, SharedReadWriteSize,  NOT_LP64(12*M) LP64_ONLY(13*M),      \
           "Size of read-write space in permanent generation (in bytes)")    \
                                                                             \
   product(uintx, SharedReadOnlySize,   10*M,                                \
-- 
GitLab