Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.cpp @ 4952:15085a6eb50c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author never
date Fri, 17 Feb 2012 12:18:52 -0800
parents 69333a2fbae2 7df3125953cb
children 33df1aeaebbf 2d503de963b3
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Fri Feb 17 12:18:10 2012 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Fri Feb 17 12:18:52 2012 -0800
@@ -1368,12 +1368,9 @@
   // 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) {