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

Merge

Browse source
This commit is contained in:
Abhijit Saha 2012-09-07 18:18:55 -07:00
commit 38b305878c
2035 changed files with 444475 additions and 31230 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1916,7 +1916,7 @@ bool Arguments::check_vm_args_consistency() {
(ExplicitGCInvokesConcurrent ||
ExplicitGCInvokesConcurrentAndUnloadsClasses)) {
jio_fprintf(defaultStream::error_stream(),
"error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts"
"error: +ExplicitGCInvokesConcurrent[AndUnloadsClasses] conflicts"
" with -UseAsyncConcMarkSweepGC");
status = false;
}
@ -3087,15 +3087,6 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
}
#endif // PRODUCT
// Transitional
if (EnableMethodHandles || AnonymousClasses) {
if (!EnableInvokeDynamic && !FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
warning("EnableMethodHandles and AnonymousClasses are obsolete. Keeping EnableInvokeDynamic disabled.");
} else {
EnableInvokeDynamic = true;
}
}
// JSR 292 is not supported before 1.7
if (!JDK_Version::is_gte_jdk17x_version()) {
if (EnableInvokeDynamic) {