# HG changeset patch
# User dcubed
# Date 1323271629 28800
# Node ID 8bf3c2a2b5e482b5b937daf1fa28e7b60fc5e6af
# Parent  b8188fb31366847cc7cc7cffcf2ddcc8e9343ba6
7118648: disable compressed oops by default on MacOS X until 7118647 is fixed
Summary: UseCompressedOops is false by default on MacOS X; can still be set manually
Reviewed-by: jmelvin, kvn, dholmes

diff -r b8188fb31366 -r 8bf3c2a2b5e4 hotspot/src/share/vm/runtime/arguments.cpp
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Dec 06 16:35:04 2011 -0500
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Dec 07 07:27:09 2011 -0800
@@ -1359,9 +1359,12 @@
   // by ergonomics.
   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
 #if !defined(COMPILER1) || defined(TIERED)
+// disable UseCompressedOops by default on MacOS X until 7118647 is fixed
+#ifndef __APPLE__
     if (FLAG_IS_DEFAULT(UseCompressedOops)) {
       FLAG_SET_ERGO(bool, UseCompressedOops, true);
     }
+#endif // !__APPLE__
 #endif
 #ifdef _WIN64
     if (UseLargePages && UseCompressedOops) {