Mercurial > hg > graal-compiler

changeset 8746:0631ebcc45f0 hs25-b23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 15 Mar 2013 11:18:39 -0700
parents 5ee744831dcb (diff) a10dc1469c3f (current diff)
children 3db4ab0e12f4
files src/share/vm/runtime/arguments.cpp
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Mar 15 04:39:05 2013 -0700
+++ b/.hgtags	Fri Mar 15 11:18:39 2013 -0700
@@ -322,3 +322,4 @@
 df5396524152118535c36da5801d828b560d19a2 hs25-b21
 4a198b201f3ce84433fa94a3ca65d061473e7c4c jdk8-b80
 dd6350b4abc4a6c19c89dd982cc0e4f3d119885c hs25-b22
+65b797426a3bec6e91b64085a0cfb94adadb634a jdk8-b81
--- a/src/share/vm/interpreter/linkResolver.cpp	Fri Mar 15 04:39:05 2013 -0700
+++ b/src/share/vm/interpreter/linkResolver.cpp	Fri Mar 15 11:18:39 2013 -0700
@@ -803,7 +803,7 @@
     if (!direct_calling_default_method &&
         check_access &&
         // a) check if ACC_SUPER flag is set for the current class
-        current_klass->is_super() &&
+        (current_klass->is_super() || !AllowNonVirtualCalls) &&
         // b) check if the method class is a superclass of the current class (superclass relation is not reflexive!)
         current_klass->is_subtype_of(method_klass()) &&
         current_klass() != method_klass() &&
--- a/src/share/vm/runtime/globals.hpp	Fri Mar 15 04:39:05 2013 -0700
+++ b/src/share/vm/runtime/globals.hpp	Fri Mar 15 11:18:39 2013 -0700
@@ -3644,7 +3644,10 @@
           "Enable internal testing APIs")                                   \
                                                                             \
   product(bool, PrintGCCause, true,                                         \
-          "Include GC cause in GC logging")
+          "Include GC cause in GC logging")                                 \
+                                                                            \
+  product(bool, AllowNonVirtualCalls, false,                                \
+          "Obey the ACC_SUPER flag and allow invokenonvirtual calls")
 
 /*
  *  Macros for factoring of globals