Mercurial > hg > graal-jvmci-8
changeset 2228:59e20a452a2a
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
author | johnc |
---|---|
date | Wed, 09 Feb 2011 09:43:02 -0800 |
parents | e5383553fd4e |
children | 183658a2d0b3 |
files | make/jprt.properties src/share/vm/runtime/arguments.cpp |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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, \
--- 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