changeset 4273:4ddaaf331af4

Merge
author jwilhelm
date Fri, 01 Mar 2013 01:14:53 +0100
parents 1a726a0f001b 12619005c5e2
children ee712d4e3af6
files
diffstat 3 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Feb 28 23:30:14 2013 +0100
+++ b/.hgtags	Fri Mar 01 01:14:53 2013 +0100
@@ -346,6 +346,14 @@
 c6b78bbaf6976197ead9d5aa3f65e0224cd13541 jdk7u10-b30
 25a92b94ad538963d009bf8a53ce548e13f55c82 jdk7u11-b20
 7a2cf85fc36e845db9ccb2a22af195c70af33bdf jdk7u11-b21
+db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03
+4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04
+f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05
+0cbce123c9027d531e585fd81fbc361c5f8407f1 jdk7u11-b06
+94bf1e3dafef3cc06d3f97f81d304313ccd999ee jdk7u11-b07
+2b543aa340e4a75671fe05803fcee08bf3e136db jdk7u11-b08
+34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u13-b09
+e0e52e35e0c53a84daadae95f626e36fd74f3eba jdk7u13-b20
 02a6c89432d724119565f9ba25672829b136fc5f jdk7u8-b01
 528502f930967f70c320472a002418f1e38029e0 jdk7u8-b02
 db63a909e1ad950ef2b9050389f51e68581b2d4e jdk7u8-b03
@@ -434,3 +442,5 @@
 88f46d2084529e3476f24209c20c6f035ad99b9f hs24-b32
 38b173289e57d26453891f417f8e8fe5da38684e jdk7u14-b13
 6a431dbf4a336343bb070b614d029d2bc6216bc8 hs24-b33
+e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
+860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
--- a/src/share/vm/interpreter/linkResolver.cpp	Thu Feb 28 23:30:14 2013 +0100
+++ b/src/share/vm/interpreter/linkResolver.cpp	Fri Mar 01 01:14:53 2013 +0100
@@ -786,7 +786,7 @@
 
     if (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() &&
         // c) check if the method is not <init>
--- a/src/share/vm/runtime/globals.hpp	Thu Feb 28 23:30:14 2013 +0100
+++ b/src/share/vm/runtime/globals.hpp	Fri Mar 01 01:14:53 2013 +0100
@@ -3619,6 +3619,9 @@
           "EINTR for I/O operations results in OS_INTRPT. The default value"\
           " of this flag is true for JDK 6 and earlier")                    \
                                                                             \
+  product(bool, AllowNonVirtualCalls, false,                                \
+         "Obey the ACC_SUPER flag and allow invokenonvirtual calls")        \
+                                                                            \
   diagnostic(bool, WhiteBoxAPI, false,                                      \
           "Enable internal testing APIs")                                   \
                                                                             \