# HG changeset patch
# User iveresov
# Date 1287512092 25200
# Node ID 4e22405d98d6a4138be937be0339fadf5ae3e429
# Parent  75ab0162aa8461ccc18ff87ae351ae5b29b45b8e
6989669: Coops: -Xshare:dump causes crash
Summary: Temporarily fix to disable compressed oops with CDS
Reviewed-by: dholmes, twisti, kvn, never

diff -r 75ab0162aa84 -r 4e22405d98d6 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Mon Oct 18 09:33:24 2010 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Tue Oct 19 11:14:52 2010 -0700
@@ -2979,6 +2979,13 @@
   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 -r 75ab0162aa84 -r 4e22405d98d6 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Mon Oct 18 09:33:24 2010 -0700
+++ b/src/share/vm/runtime/globals.hpp	Tue Oct 19 11:14:52 2010 -0700
@@ -3545,7 +3545,7 @@
   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,                                \