Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/arguments.cpp @ 6905:e4d10261499c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Fri, 07 Sep 2012 18:18:55 -0700
parents 6b5a3d18fe0e bb3f6194fedb
children 218a94758fe7 b95ad0610fef
comparison
equal deleted inserted replaced
6904:defeb6dad7d5 6905:e4d10261499c
1914 // Note: only executed in non-PRODUCT mode 1914 // Note: only executed in non-PRODUCT mode
1915 if (!UseAsyncConcMarkSweepGC && 1915 if (!UseAsyncConcMarkSweepGC &&
1916 (ExplicitGCInvokesConcurrent || 1916 (ExplicitGCInvokesConcurrent ||
1917 ExplicitGCInvokesConcurrentAndUnloadsClasses)) { 1917 ExplicitGCInvokesConcurrentAndUnloadsClasses)) {
1918 jio_fprintf(defaultStream::error_stream(), 1918 jio_fprintf(defaultStream::error_stream(),
1919 "error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts" 1919 "error: +ExplicitGCInvokesConcurrent[AndUnloadsClasses] conflicts"
1920 " with -UseAsyncConcMarkSweepGC"); 1920 " with -UseAsyncConcMarkSweepGC");
1921 status = false; 1921 status = false;
1922 } 1922 }
1923 1923
1924 status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk"); 1924 status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk");
3085 UseCounterDecay = false; 3085 UseCounterDecay = false;
3086 } 3086 }
3087 } 3087 }
3088 #endif // PRODUCT 3088 #endif // PRODUCT
3089 3089
3090 // Transitional
3091 if (EnableMethodHandles || AnonymousClasses) {
3092 if (!EnableInvokeDynamic && !FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
3093 warning("EnableMethodHandles and AnonymousClasses are obsolete. Keeping EnableInvokeDynamic disabled.");
3094 } else {
3095 EnableInvokeDynamic = true;
3096 }
3097 }
3098
3099 // JSR 292 is not supported before 1.7 3090 // JSR 292 is not supported before 1.7
3100 if (!JDK_Version::is_gte_jdk17x_version()) { 3091 if (!JDK_Version::is_gte_jdk17x_version()) {
3101 if (EnableInvokeDynamic) { 3092 if (EnableInvokeDynamic) {
3102 if (!FLAG_IS_DEFAULT(EnableInvokeDynamic)) { 3093 if (!FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
3103 warning("JSR 292 is not supported before 1.7. Disabling support."); 3094 warning("JSR 292 is not supported before 1.7. Disabling support.");