From 2a362d8b87f229ed71bef3a6cdf56ce5ee54d217 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Mon, 24 Aug 2009 11:13:46 -0700 Subject: [PATCH] 6873800: enable compressed oops by default Enable compressed oops by default Reviewed-by: never, ysr --- hotspot/src/share/vm/runtime/arguments.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp index 86cb99ffc22..2cce4522094 100644 --- a/hotspot/src/share/vm/runtime/arguments.cpp +++ b/hotspot/src/share/vm/runtime/arguments.cpp @@ -1233,10 +1233,8 @@ void Arguments::set_ergonomics_flags() { // Check that UseCompressedOops can be set with the max heap size allocated // by ergonomics. if (MaxHeapSize <= max_heap_for_compressed_oops()) { - if (FLAG_IS_DEFAULT(UseCompressedOops)) { - // Turn off until bug is fixed. - // the following line to return it to default status. - // FLAG_SET_ERGO(bool, UseCompressedOops, true); + if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) { + FLAG_SET_ERGO(bool, UseCompressedOops, true); } #ifdef _WIN64 if (UseLargePages && UseCompressedOops) {