Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 3243:208b6c560ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author vladidan
date Thu, 14 Apr 2011 11:02:05 -0400
parents 3449f5e02cc4
children 0654ee04b214 732454aaf5cb
comparison
equal deleted inserted replaced
3242:c737922fd8bb 3243:208b6c560ff4
242 { "HandlePromotionFailure", 242 { "HandlePromotionFailure",
243 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) }, 243 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
244 { "MaxLiveObjectEvacuationRatio", 244 { "MaxLiveObjectEvacuationRatio",
245 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) }, 245 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
246 { "ForceSharedSpaces", JDK_Version::jdk_update(6,25), JDK_Version::jdk(8) }, 246 { "ForceSharedSpaces", JDK_Version::jdk_update(6,25), JDK_Version::jdk(8) },
247 { "AllowTransitionalJSR292", JDK_Version::jdk(7), JDK_Version::jdk(8) },
247 { NULL, JDK_Version(0), JDK_Version(0) } 248 { NULL, JDK_Version(0), JDK_Version(0) }
248 }; 249 };
249 250
250 // Returns true if the flag is obsolete and fits into the range specified 251 // Returns true if the flag is obsolete and fits into the range specified
251 // for being ignored. In the case that the flag is ignored, the 'version' 252 // for being ignored. In the case that the flag is ignored, the 'version'
960 (char*)Abstract_VM_Version::vm_info_string(), false); 961 (char*)Abstract_VM_Version::vm_info_string(), false);
961 962
962 UseInterpreter = true; 963 UseInterpreter = true;
963 UseCompiler = true; 964 UseCompiler = true;
964 UseLoopCounter = true; 965 UseLoopCounter = true;
966
967 #ifndef ZERO
968 // Turn these off for mixed and comp. Leave them on for Zero.
969 if (FLAG_IS_DEFAULT(UseFastAccessorMethods)) {
970 UseFastAccessorMethods = mode == _int;
971 }
972 if (FLAG_IS_DEFAULT(UseFastEmptyMethods)) {
973 UseFastEmptyMethods = mode == _int;
974 }
975 #endif
965 976
966 // Default values may be platform/compiler dependent - 977 // Default values may be platform/compiler dependent -
967 // use the saved values 978 // use the saved values
968 ClipInlining = Arguments::_ClipInlining; 979 ClipInlining = Arguments::_ClipInlining;
969 AlwaysCompileLoopMethods = Arguments::_AlwaysCompileLoopMethods; 980 AlwaysCompileLoopMethods = Arguments::_AlwaysCompileLoopMethods;
2973 UseCounterDecay = false; 2984 UseCounterDecay = false;
2974 } 2985 }
2975 } 2986 }
2976 #endif // PRODUCT 2987 #endif // PRODUCT
2977 2988
2978 if (EnableInvokeDynamic && !EnableMethodHandles) { 2989 // Transitional
2979 if (!FLAG_IS_DEFAULT(EnableMethodHandles)) { 2990 if (EnableMethodHandles || AnonymousClasses) {
2980 warning("forcing EnableMethodHandles true because EnableInvokeDynamic is true"); 2991 if (!EnableInvokeDynamic && !FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
2981 } 2992 warning("EnableMethodHandles and AnonymousClasses are obsolete. Keeping EnableInvokeDynamic disabled.");
2982 EnableMethodHandles = true; 2993 } else {
2983 } 2994 EnableInvokeDynamic = true;
2984 if (EnableMethodHandles && !AnonymousClasses) { 2995 }
2985 if (!FLAG_IS_DEFAULT(AnonymousClasses)) { 2996 }
2986 warning("forcing AnonymousClasses true because EnableMethodHandles is true"); 2997
2987 } 2998 // JSR 292 is not supported before 1.7
2988 AnonymousClasses = true; 2999 if (!JDK_Version::is_gte_jdk17x_version()) {
2989 } 3000 if (EnableInvokeDynamic) {
2990 if ((EnableMethodHandles || AnonymousClasses) && ScavengeRootsInCode == 0) { 3001 if (!FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
3002 warning("JSR 292 is not supported before 1.7. Disabling support.");
3003 }
3004 EnableInvokeDynamic = false;
3005 }
3006 }
3007
3008 if (EnableInvokeDynamic && ScavengeRootsInCode == 0) {
2991 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) { 3009 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
2992 warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true"); 3010 warning("forcing ScavengeRootsInCode non-zero because EnableInvokeDynamic is true");
2993 } 3011 }
2994 ScavengeRootsInCode = 1; 3012 ScavengeRootsInCode = 1;
2995 } 3013 }
2996 if (!JavaObjectsInPerm && ScavengeRootsInCode == 0) { 3014 if (!JavaObjectsInPerm && ScavengeRootsInCode == 0) {
2997 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) { 3015 if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {