archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Keith McGuigan 2009-11-11 09:13:12 -05:00
commit 01b706e9f9
4823 changed files with 10148 additions and 1018700 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -1240,9 +1240,11 @@ 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()) {
#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 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
}
}
#if defined(_LP64) && defined(COMPILER1)
UseCompressedOops = false;
#endif
#ifdef SERIALGC
force_serial_gc();
#endif // SERIALGC