/hg/release/icedtea7-forest-2.2/hotspot: 2 new changesets

[andrew at icedtea.classpath.org]

changeset da3747196112 in /hg/release/icedtea7-forest-2.2/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=da3747196112
author: kamg
date: Thu Nov 08 17:45:05 2012 -0500

	8001307: Modify ACC_SUPER behavior
	Summary: Disallow non-virtual calls even when ACC_SUPER is absent.
	Reviewed-by: kvn, acorn


changeset d2e4bf94d38d in /hg/release/icedtea7-forest-2.2/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot?cmd=changeset;node=d2e4bf94d38d
author: andrew
date: Tue Feb 05 08:35:56 2013 +0000

	Added tag icedtea-2.2.5 for changeset da3747196112


diffstat:

 .hgtags                                   |  1 +
 src/share/vm/interpreter/linkResolver.cpp |  2 +-
 src/share/vm/runtime/globals.hpp          |  5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 60d6e32e00a6 -r d2e4bf94d38d .hgtags
--- a/.hgtags	Mon Jan 14 22:54:04 2013 +0000
+++ b/.hgtags	Tue Feb 05 08:35:56 2013 +0000
@@ -289,3 +289,4 @@
 0000000000000000000000000000000000000000 icedtea-2.2.3
 fe641a4f943d914e50b3a984eb9ab12b680d635a icedtea-2.2.3
 1a3dc05d59c23a25053386c921afc24d2a5d2734 icedtea-2.2.4
+da3747196112fca6f8f3db3b80712bcd3b10c477 icedtea-2.2.5
diff -r 60d6e32e00a6 -r d2e4bf94d38d src/share/vm/interpreter/linkResolver.cpp
--- a/src/share/vm/interpreter/linkResolver.cpp	Mon Jan 14 22:54:04 2013 +0000
+++ b/src/share/vm/interpreter/linkResolver.cpp	Tue Feb 05 08:35:56 2013 +0000
@@ -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>
diff -r 60d6e32e00a6 -r d2e4bf94d38d src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Mon Jan 14 22:54:04 2013 +0000
+++ b/src/share/vm/runtime/globals.hpp	Tue Feb 05 08:35:56 2013 +0000
@@ -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