Mercurial > hg > truffle

comparison 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
comparison
equal deleted inserted replaced
4951:72c425c46102 4952:15085a6eb50c
1366 #ifdef _LP64 1366 #ifdef _LP64
1367 // Check that UseCompressedOops can be set with the max heap size allocated 1367 // Check that UseCompressedOops can be set with the max heap size allocated
1368 // by ergonomics. 1368 // by ergonomics.
1369 if (MaxHeapSize <= max_heap_for_compressed_oops()) { 1369 if (MaxHeapSize <= max_heap_for_compressed_oops()) {
1370 #if !defined(COMPILER1) || defined(TIERED) 1370 #if !defined(COMPILER1) || defined(TIERED)
1371 // disable UseCompressedOops by default on MacOS X until 7118647 is fixed
1372 #ifndef __APPLE__
1373 if (FLAG_IS_DEFAULT(UseCompressedOops)) { 1371 if (FLAG_IS_DEFAULT(UseCompressedOops)) {
1374 FLAG_SET_ERGO(bool, UseCompressedOops, true); 1372 FLAG_SET_ERGO(bool, UseCompressedOops, true);
1375 } 1373 }
1376 #endif // !__APPLE__
1377 #endif 1374 #endif
1378 #ifdef _WIN64 1375 #ifdef _WIN64
1379 if (UseLargePages && UseCompressedOops) { 1376 if (UseLargePages && UseCompressedOops) {
1380 // Cannot allocate guard pages for implicit checks in indexed addressing 1377 // Cannot allocate guard pages for implicit checks in indexed addressing
1381 // mode, when large pages are specified on windows. 1378 // mode, when large pages are specified on windows.