# HG changeset patch
# User johnc
# Date 1297273382 28800
# Node ID 59e20a452a2a26a584fe60729cebd3369d7ce756
# Parent  e5383553fd4eb451f7709c350ce8173b940cc2c0
7017008: G1: Turn on compressed oops by default.
Summary: Normally compressed oops is enabled when the maximum heap size is under a certain limit, except when G1 is also enabled. Remove this limitation. Also re-enable GCBasher testing with G1 on 64 bit windows in jprt.
Reviewed-by: jcoomes, brutisso, tonyp

diff -r e5383553fd4e -r 59e20a452a2a make/jprt.properties
--- a/make/jprt.properties	Tue Feb 08 12:33:19 2011 +0100
+++ b/make/jprt.properties	Wed Feb 09 09:43:02 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,7 @@
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
+    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_G1, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_default, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
diff -r e5383553fd4e -r 59e20a452a2a src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Feb 08 12:33:19 2011 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Wed Feb 09 09:43:02 2011 -0800
@@ -1410,7 +1410,7 @@
   // by ergonomics.
   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
 #if !defined(COMPILER1) || defined(TIERED)
-    if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
+    if (FLAG_IS_DEFAULT(UseCompressedOops)) {
       FLAG_SET_ERGO(bool, UseCompressedOops, true);
     }
 #endif