diff src/share/vm/runtime/globals.hpp @ 2492:4e5515d09314

Fixed merge issues. - Accessing static fields from the java.lang.Class object instead of the klassOop (1-line-change) - Fixed issue with RiField object caching (the caching was only taking the offset as a field ID, but need to take offset+is_static)
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 22 Apr 2011 19:00:07 +0200
parents 0654ee04b214
children 008adfd6d850
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.hpp	Fri Apr 22 15:30:53 2011 +0200
+++ b/src/share/vm/runtime/globals.hpp	Fri Apr 22 19:00:07 2011 +0200
@@ -3696,7 +3696,7 @@
           "Skip assert() and verify() which page-in unwanted shared "       \
           "objects. ")                                                      \
                                                                             \
-  diagnostic(bool, EnableInvokeDynamic, true,                               \
+  diagnostic(bool, EnableInvokeDynamic, false,                              \
           "support JSR 292 (method handles, invokedynamic, "                \
           "anonymous classes")                                              \
                                                                             \