archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Edvard Wendelin 2013-02-25 07:22:06 +01:00
commit c6e54df5d6
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/interpreter/linkResolver.cpp
View file

@ -803,7 +803,7 @@ void LinkResolver::runtime_resolve_special_method(CallInfo& result, methodHandle
if (!direct_calling_default_method && if (!direct_calling_default_method &&
check_access && check_access &&
// a) check if ACC_SUPER flag is set for the current class // 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!) // 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->is_subtype_of(method_klass()) &&
current_klass() != method_klass() && current_klass() != method_klass() &&

5
hotspot/src/share/vm/runtime/globals.hpp
View file

@ -3640,7 +3640,10 @@ class CommandLineFlags {
"Enable internal testing APIs") \ "Enable internal testing APIs") \
\ \
product(bool, PrintGCCause, true, \ 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 * Macros for factoring of globals