Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 344:6aae2f9d0294

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ysr
date Thu, 12 Jun 2008 13:50:55 -0700
parents 37f87013dfd8 790e66e5fbac
children 1ee8caae33af
comparison
equal deleted inserted replaced
342:37f87013dfd8 344:6aae2f9d0294
1169 #ifdef _LP64 1169 #ifdef _LP64
1170 // Compressed Headers do not work with CMS, which uses a bit in the klass 1170 // Compressed Headers do not work with CMS, which uses a bit in the klass
1171 // field offset to determine free list chunk markers. 1171 // field offset to determine free list chunk markers.
1172 // Check that UseCompressedOops can be set with the max heap size allocated 1172 // Check that UseCompressedOops can be set with the max heap size allocated
1173 // by ergonomics. 1173 // by ergonomics.
1174 if (!UseG1GC && !UseConcMarkSweepGC && MaxHeapSize <= max_heap_for_compressed_oops()) { 1174 if (MaxHeapSize <= max_heap_for_compressed_oops()) {
1175 if (FLAG_IS_DEFAULT(UseCompressedOops)) { 1175 if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
1176 FLAG_SET_ERGO(bool, UseCompressedOops, true); 1176 // Leave compressed oops off by default. Uncomment
1177 // the following line to return it to default status.
1178 // FLAG_SET_ERGO(bool, UseCompressedOops, true);
1179 } else if (UseCompressedOops && UseG1GC) {
1180 warning(" UseCompressedOops does not currently work with UseG1GC; switching off UseCompressedOops. ");
1181 FLAG_SET_DEFAULT(UseCompressedOops, false);
1177 } 1182 }
1178 } else { 1183 } else {
1179 if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) { 1184 if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {
1180 // If specified, give a warning 1185 warning("Max heap size too large for Compressed Oops");
1181 if (UseConcMarkSweepGC){
1182 warning("Compressed Oops does not work with CMS");
1183 } else if (UseG1GC) {
1184 warning("Compressed Oops does not work with UseG1GC");
1185 } else {
1186 warning(
1187 "Max heap size too large for Compressed Oops");
1188 }
1189 FLAG_SET_DEFAULT(UseCompressedOops, false); 1186 FLAG_SET_DEFAULT(UseCompressedOops, false);
1190 } 1187 }
1191 } 1188 }
1192 // Also checks that certain machines are slower with compressed oops 1189 // Also checks that certain machines are slower with compressed oops
1193 // in vm_version initialization code. 1190 // in vm_version initialization code.
1330 sprintf(buffer, "java.lang.Integer.IntegerCache.high=%d", AutoBoxCacheMax); 1327 sprintf(buffer, "java.lang.Integer.IntegerCache.high=%d", AutoBoxCacheMax);
1331 add_property(buffer); 1328 add_property(buffer);
1332 } 1329 }
1333 if (AggressiveOpts && FLAG_IS_DEFAULT(DoEscapeAnalysis)) { 1330 if (AggressiveOpts && FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
1334 FLAG_SET_DEFAULT(DoEscapeAnalysis, true); 1331 FLAG_SET_DEFAULT(DoEscapeAnalysis, true);
1332 }
1333 if (AggressiveOpts && FLAG_IS_DEFAULT(SpecialArraysEquals)) {
1334 FLAG_SET_DEFAULT(SpecialArraysEquals, true);
1335 } 1335 }
1336 #endif 1336 #endif
1337 1337
1338 if (AggressiveOpts) { 1338 if (AggressiveOpts) {
1339 // Sample flag setting code 1339 // Sample flag setting code