Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 4934:7df3125953cb
7146354: Re-enable Compressed OOPs after 7118647 is resolved
Summary: Relax the assertion to simply check for COOP mode rather than an exact address.
Reviewed-by: coleenp, kvn, phh, dcubed
Contributed-by: james.melvin@oracle.com
author | coleenp |
---|---|
date | Thu, 16 Feb 2012 15:52:01 -0500 |
parents | 24cae3e4cbaa |
children | 15085a6eb50c |
comparison
equal
deleted
inserted
replaced
4932:f1cb6f9cfe21 | 4934:7df3125953cb |
---|---|
1368 #ifdef _LP64 | 1368 #ifdef _LP64 |
1369 // Check that UseCompressedOops can be set with the max heap size allocated | 1369 // Check that UseCompressedOops can be set with the max heap size allocated |
1370 // by ergonomics. | 1370 // by ergonomics. |
1371 if (MaxHeapSize <= max_heap_for_compressed_oops()) { | 1371 if (MaxHeapSize <= max_heap_for_compressed_oops()) { |
1372 #if !defined(COMPILER1) || defined(TIERED) | 1372 #if !defined(COMPILER1) || defined(TIERED) |
1373 // disable UseCompressedOops by default on MacOS X until 7118647 is fixed | |
1374 #ifndef __APPLE__ | |
1375 if (FLAG_IS_DEFAULT(UseCompressedOops)) { | 1373 if (FLAG_IS_DEFAULT(UseCompressedOops)) { |
1376 FLAG_SET_ERGO(bool, UseCompressedOops, true); | 1374 FLAG_SET_ERGO(bool, UseCompressedOops, true); |
1377 } | 1375 } |
1378 #endif // !__APPLE__ | |
1379 #endif | 1376 #endif |
1380 #ifdef _WIN64 | 1377 #ifdef _WIN64 |
1381 if (UseLargePages && UseCompressedOops) { | 1378 if (UseLargePages && UseCompressedOops) { |
1382 // Cannot allocate guard pages for implicit checks in indexed addressing | 1379 // Cannot allocate guard pages for implicit checks in indexed addressing |
1383 // mode, when large pages are specified on windows. | 1380 // mode, when large pages are specified on windows. |