comparison src/share/vm/runtime/arguments.cpp @ 6857:5876f980ea19

Merge
author collins
date Fri, 12 Oct 2012 11:31:27 -0700
parents fb19af007ffc 8e47bac5643a
children 85916677fc22 d2582a08fa5d b95ad0610fef
comparison
equal deleted inserted replaced
6856:9855b7e559ae 6857:5876f980ea19
1421 warning("UseCompressedKlassPointers requires UseCompressedOops"); 1421 warning("UseCompressedKlassPointers requires UseCompressedOops");
1422 } 1422 }
1423 FLAG_SET_DEFAULT(UseCompressedKlassPointers, false); 1423 FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
1424 } else { 1424 } else {
1425 // Turn on UseCompressedKlassPointers too 1425 // Turn on UseCompressedKlassPointers too
1426 // The compiler is broken for this so turn it on when the compiler is fixed. 1426 if (FLAG_IS_DEFAULT(UseCompressedKlassPointers)) {
1427 // if (FLAG_IS_DEFAULT(UseCompressedKlassPointers)) { 1427 FLAG_SET_ERGO(bool, UseCompressedKlassPointers, true);
1428 // FLAG_SET_ERGO(bool, UseCompressedKlassPointers, true); 1428 }
1429 // }
1430 // Set the ClassMetaspaceSize to something that will not need to be 1429 // Set the ClassMetaspaceSize to something that will not need to be
1431 // expanded, since it cannot be expanded. 1430 // expanded, since it cannot be expanded.
1432 if (UseCompressedKlassPointers && FLAG_IS_DEFAULT(ClassMetaspaceSize)) { 1431 if (UseCompressedKlassPointers && FLAG_IS_DEFAULT(ClassMetaspaceSize)) {
1433 // 100,000 classes seems like a good size, so 100M assumes around 1K 1432 // 100,000 classes seems like a good size, so 100M assumes around 1K
1434 // per klass. The vtable and oopMap is embedded so we don't have a fixed 1433 // per klass. The vtable and oopMap is embedded so we don't have a fixed