Mercurial > hg > graal-jvmci-8

diff src/share/vm/interpreter/linkResolver.cpp @ 8706:11d5942ef9c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Tue, 12 Mar 2013 18:22:40 -0700
parents f16e75e0cf11 1cabf9c80e84
children cd3089a56438
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.cpp	Fri Mar 08 08:10:01 2013 -0800
+++ b/src/share/vm/interpreter/linkResolver.cpp	Tue Mar 12 18:22:40 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() &&