Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.cpp @ 17677:51e1bb81df86 jdk8u20-b03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Tue, 25 Feb 2014 13:02:52 -0800
parents 1419657ed891
children 595c0f60d50d 752ba2e5f6d0
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Wed Feb 19 20:53:38 2014 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Tue Feb 25 13:02:52 2014 -0800
@@ -290,6 +290,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) },
@@ -878,7 +879,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);