< prev index next >
src/hotspot/share/runtime/arguments.cpp
Print this page
rev 52611 : webrev.00
rev 52613 : webrev.01
@@ -1620,10 +1620,14 @@
LP64_ONLY(return OopEncodingHeapMax - displacement_due_to_null_page);
NOT_LP64(ShouldNotReachHere(); return 0);
}
void Arguments::set_use_compressed_oops() {
+if (AllocateOldGenAt != NULL) {
+ FLAG_SET_ERGO(bool, UseCompressedOops, false);
+ return;
+}
#ifndef ZERO
#ifdef _LP64
// MaxHeapSize is not set up properly at this point, but
// the only value that can override MaxHeapSize if we are
// to use UseCompressedOops is InitialHeapSize.
@@ -2061,21 +2065,11 @@
if ((UseNUMAInterleaving && !FLAG_IS_DEFAULT(UseNUMAInterleaving)) || (UseNUMA && !FLAG_IS_DEFAULT(UseNUMA))) {
log_warning(arguments) ("NUMA support for Heap depends on the file system when AllocateHeapAt option is used.\n");
}
}
- if(!FLAG_IS_DEFAULT(AllocateHeapAt) && !FLAG_IS_DEFAULT(AllocateOldGenAt)) {
- jio_fprintf(defaultStream::error_stream(),
- "AllocateHeapAt and AllocateOldGenAt cannot be used together.\n");
- status = false;
- }
-
- if (!FLAG_IS_DEFAULT(AllocateOldGenAt) && (UseSerialGC || UseConcMarkSweepGC || UseEpsilonGC || UseZGC)) {
- jio_fprintf(defaultStream::error_stream(),
- "AllocateOldGenAt not supported for selected GC.\n");
- status = false;
- }
+ status = status && GCArguments::check_args_consistency();
return status;
}
bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
< prev index next >