comparison src/share/vm/runtime/arguments.cpp @ 17799:752ba2e5f6d0

Merge
author kvn
date Tue, 25 Feb 2014 15:11:18 -0800
parents f040cf9fc9c0 1419657ed891
children 62c54fcc0a35
comparison
equal deleted inserted replaced
17798:f040cf9fc9c0 17799:752ba2e5f6d0
291 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 291 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) },
292 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 292 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) },
293 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 293 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) },
294 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 294 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) },
295 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 295 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) },
296 { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) },
296 #ifdef PRODUCT 297 #ifdef PRODUCT
297 { "DesiredMethodLimit", 298 { "DesiredMethodLimit",
298 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, 299 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
299 #endif // PRODUCT 300 #endif // PRODUCT
300 { NULL, JDK_Version(0), JDK_Version(0) } 301 { NULL, JDK_Version(0), JDK_Version(0) }
879 arg_len = strlen(argname); 880 arg_len = strlen(argname);
880 } else { 881 } else {
881 arg_len = equal_sign - argname; 882 arg_len = equal_sign - argname;
882 } 883 }
883 884
884 Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true); 885 Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true, true);
885 if (found_flag != NULL) { 886 if (found_flag != NULL) {
886 char locked_message_buf[BUFLEN]; 887 char locked_message_buf[BUFLEN];
887 found_flag->get_locked_message(locked_message_buf, BUFLEN); 888 found_flag->get_locked_message(locked_message_buf, BUFLEN);
888 if (strlen(locked_message_buf) == 0) { 889 if (strlen(locked_message_buf) == 0) {
889 if (found_flag->is_bool() && !has_plus_minus) { 890 if (found_flag->is_bool() && !has_plus_minus) {