Mercurial > hg > truffle
changeset 8704:1cabf9c80e84
Merge
author | ewendeli |
---|---|
date | Tue, 19 Feb 2013 21:45:09 +0100 |
parents | cdb46031e718 (current diff) b5cb079ecaa4 (diff) |
children | d4a32a6f8c82 |
files | src/share/vm/interpreter/linkResolver.cpp src/share/vm/runtime/arguments.cpp |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.cpp Fri Feb 08 08:07:07 2013 -0800 +++ b/src/share/vm/interpreter/linkResolver.cpp Tue Feb 19 21:45:09 2013 +0100 @@ -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 Feb 08 08:07:07 2013 -0800 +++ b/src/share/vm/runtime/globals.hpp Tue Feb 19 21:45:09 2013 +0100 @@ -3634,7 +3634,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