Mercurial > hg > openjdk > bsd-port > hotspot
changeset 3729:0cbce123c902 jdk7u11-b06
Merge
author | ewendeli |
---|---|
date | Thu, 22 Nov 2012 08:19:35 +0100 |
parents | 78c7e1b4a006 (current diff) 8ecba09e66cd (diff) |
children | c217f85ffff8 |
files | .hgtags |
diffstat | 4 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Nov 21 21:07:59 2012 -0800 +++ b/.hgtags Thu Nov 22 08:19:35 2012 +0100 @@ -341,3 +341,6 @@ 63e8b49b329e4b50547b13f5c732665bed535732 jdk7u10-b15 1cb34ef50bddc334c8538cf85d8612383debc74f jdk7u10-b16 5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17 +db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03 +4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04 +f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05
--- a/make/hotspot_version Wed Nov 21 21:07:59 2012 -0800 +++ b/make/hotspot_version Thu Nov 22 08:19:35 2012 +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 Wed Nov 21 21:07:59 2012 -0800 +++ b/src/share/vm/interpreter/linkResolver.cpp Thu Nov 22 08:19:35 2012 +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 Wed Nov 21 21:07:59 2012 -0800 +++ b/src/share/vm/runtime/globals.hpp Thu Nov 22 08:19:35 2012 +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