Mercurial > hg > graal-jvmci-8
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Wed Feb 19 20:12:43 2014 -0800 +++ b/src/share/vm/runtime/arguments.cpp Tue Feb 25 15:11:18 2014 -0800 @@ -293,6 +293,7 @@ { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, + { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, #ifdef PRODUCT { "DesiredMethodLimit", JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, @@ -881,7 +882,7 @@ arg_len = equal_sign - argname; } - Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true); + Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true, true); if (found_flag != NULL) { char locked_message_buf[BUFLEN]; found_flag->get_locked_message(locked_message_buf, BUFLEN);