Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 17677:51e1bb81df86 jdk8u20-b03
Merge
author | amurillo |
---|---|
date | Tue, 25 Feb 2014 13:02:52 -0800 |
parents | 1419657ed891 |
children | 595c0f60d50d 752ba2e5f6d0 |
comparison
equal
deleted
inserted
replaced
17660:9a93fe1babdc | 17677:51e1bb81df86 |
---|---|
288 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 288 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
289 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 289 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
290 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 290 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
291 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 291 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
292 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 292 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
293 { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, | |
293 #ifdef PRODUCT | 294 #ifdef PRODUCT |
294 { "DesiredMethodLimit", | 295 { "DesiredMethodLimit", |
295 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, | 296 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, |
296 #endif // PRODUCT | 297 #endif // PRODUCT |
297 { NULL, JDK_Version(0), JDK_Version(0) } | 298 { NULL, JDK_Version(0), JDK_Version(0) } |
876 arg_len = strlen(argname); | 877 arg_len = strlen(argname); |
877 } else { | 878 } else { |
878 arg_len = equal_sign - argname; | 879 arg_len = equal_sign - argname; |
879 } | 880 } |
880 | 881 |
881 Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true); | 882 Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true, true); |
882 if (found_flag != NULL) { | 883 if (found_flag != NULL) { |
883 char locked_message_buf[BUFLEN]; | 884 char locked_message_buf[BUFLEN]; |
884 found_flag->get_locked_message(locked_message_buf, BUFLEN); | 885 found_flag->get_locked_message(locked_message_buf, BUFLEN); |
885 if (strlen(locked_message_buf) == 0) { | 886 if (strlen(locked_message_buf) == 0) { |
886 if (found_flag->is_bool() && !has_plus_minus) { | 887 if (found_flag->is_bool() && !has_plus_minus) { |