changeset 4244:34a7b6dda06e jdk7u13-b09 jdk7u15-b32

Merge
author ewendeli
date Mon, 14 Jan 2013 18:32:56 +0100
parents b6d58acbaf5d ed328ec14835
children e0e52e35e0c5 d2b587401182
files .hgtags
diffstat 4 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Jan 12 14:42:56 2013 -0800
+++ b/.hgtags	Mon Jan 14 18:32:56 2013 +0100
@@ -345,3 +345,9 @@
 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
--- a/make/hotspot_version	Sat Jan 12 14:42:56 2013 -0800
+++ b/make/hotspot_version	Mon Jan 14 18:32:56 2013 +0100
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2012
+HOTSPOT_VM_COPYRIGHT=Copyright 2013
 
 HS_MAJOR_VER=23
-HS_MINOR_VER=6
-HS_BUILD_NUMBER=04
+HS_MINOR_VER=7
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/src/share/vm/interpreter/linkResolver.cpp	Sat Jan 12 14:42:56 2013 -0800
+++ b/src/share/vm/interpreter/linkResolver.cpp	Mon Jan 14 18:32:56 2013 +0100
@@ -712,7 +712,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	Sat Jan 12 14:42:56 2013 -0800
+++ b/src/share/vm/runtime/globals.hpp	Mon Jan 14 18:32:56 2013 +0100
@@ -3902,7 +3902,10 @@
   product(bool, UseVMInterruptibleIO, false,                                \
           "(Unstable, Solaris-specific) Thread interrupt before or with "   \
           "EINTR for I/O operations results in OS_INTRPT. The default value"\
-          " of this flag is true for JDK 6 and earlier")
+          " of this flag is true for JDK 6 and earlier")                    \
+                                                                            \
+  product(bool, AllowNonVirtualCalls, false,                                \
+         "Obey the ACC_SUPER flag and allow invokenonvirtual calls")
 
 /*
  *  Macros for factoring of globals