Mercurial > hg > graal-compiler
diff src/share/vm/runtime/arguments.cpp @ 1069:fb4c00faa9da
Merge
author | kamg |
---|---|
date | Wed, 11 Nov 2009 09:13:12 -0500 |
parents | 473cce303f13 323bd24c6520 |
children | 84cb6f20afb3 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Fri Nov 06 16:05:59 2009 -0500 +++ b/src/share/vm/runtime/arguments.cpp Wed Nov 11 09:13:12 2009 -0500 @@ -1240,9 +1240,11 @@ // Check that UseCompressedOops can be set with the max heap size allocated // by ergonomics. if (MaxHeapSize <= max_heap_for_compressed_oops()) { +#ifndef COMPILER1 if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) { FLAG_SET_ERGO(bool, UseCompressedOops, true); } +#endif #ifdef _WIN64 if (UseLargePages && UseCompressedOops) { // Cannot allocate guard pages for implicit checks in indexed addressing @@ -2704,6 +2706,10 @@ } } +#if defined(_LP64) && defined(COMPILER1) + UseCompressedOops = false; +#endif + #ifdef SERIALGC force_serial_gc(); #endif // SERIALGC