# HG changeset patch # User andrew # Date 1429679872 -3600 # Node ID 3bd13d57fbcccbcfb89684afcf614194a6967ad2 # Parent 584622a1ee065c3d9438dc3d57fd66735c4558f2# Parent 5321d26956b283b7cb73b04b91db41c7c9fe9158 Merge jdk8u45-b14 diff -r 584622a1ee06 -r 3bd13d57fbcc .hgtags --- a/.hgtags Wed Apr 22 06:15:36 2015 +0100 +++ b/.hgtags Wed Apr 22 06:17:52 2015 +0100 @@ -547,6 +547,8 @@ 28b50d07f6f8c5a567b6a25e95a423948114a004 jdk8u25-b17 639abc668bfe995dba811dd35411b9ea8a9041cd jdk8u25-b18 c3528699fb33fe3eb1d117504184ae7ab2507aa1 jdk8u25-b31 +631f0c7b49c091c6865d79d248d6551a270ac22f jdk8u25-b32 +4e1f52384f9ffa803838acad545cd63de48a7b35 jdk8u25-b33 5bb683bbe2c74876d585b5c3232fc3aab7b23e97 jdk8u31-b00 5bb686ae3b89f8aa1c74331b2d24e2a5ebd43448 jdk8u31-b01 087678da96603c9705b38b6cc4a6569ac7b4420a jdk8u31-b02 @@ -561,6 +563,8 @@ 9906d432d6dbd2cda242e3f3cfde7cf6c90245bf jdk8u31-b11 e13839545238d1ecf17f0489bb6fb765de46719a jdk8u31-b12 4206e725d584be942c25ff46ff23d8e299ca4a4c jdk8u31-b13 +b517d3a9aebf0fee64808f9a7c0ef8e0b82d5ed3 jdk8u31-b31 +15d8108258cb60a58bdd03b9ff8e77dd6727a804 jdk8u31-b32 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11 @@ -590,3 +594,17 @@ 698dd28ecc785ffc43e3f12266b13e85382c26a8 jdk8u40-b25 f39b6944ad447269b81e06ca5da9edff9e9e67c8 jdk8u40-b26 6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27 +b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00 +41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01 +626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02 +f41aa01b0a043611ee0abcb81a40f7d80085ec27 jdk8u45-b03 +2f586e3c4b6db807ac6036b485b2890ff82f7bfd jdk8u45-b04 +344ff6e45a1e2960ac4a583f63ebfb54cd52e6b4 jdk8u45-b05 +3afa9cc6e8d537ee456b8e12d1abb1da520b5ddc jdk8u45-b06 +5871f3dd9b4a2c4b44e7da2184f4430323e0c04b jdk8u45-b07 +35c7330b68e21d0dfaaedaaf74b794fd10606e9c jdk8u45-b08 +35d8318de0b6d4e68e2e0a04f6e20cafd113ca54 jdk8u45-b09 +a9f5786079202b74b3651e1097c0b2341b2178b9 jdk8u45-b10 +f4822d12204179e6a3e7aaf98991b6171670cbf2 jdk8u45-b11 +dc29108bcbcbfcd49eaa9135368306dc85db73a6 jdk8u45-b12 +efbf340fc7f56e49735111c23cef030413146409 jdk8u45-b13 diff -r 584622a1ee06 -r 3bd13d57fbcc THIRD_PARTY_README --- a/THIRD_PARTY_README Wed Apr 22 06:15:36 2015 +0100 +++ b/THIRD_PARTY_README Wed Apr 22 06:17:52 2015 +0100 @@ -1250,7 +1250,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.5.4, which may be +%% This notice is provided with respect to libpng 1.6.16, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1266,8 +1266,8 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are -Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are +Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1364,7 +1364,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 7, 2011 +December 22, 2014 --- end of LICENSE --- diff -r 584622a1ee06 -r 3bd13d57fbcc make/hotspot_version --- a/make/hotspot_version Wed Apr 22 06:15:36 2015 +0100 +++ b/make/hotspot_version Wed Apr 22 06:17:52 2015 +0100 @@ -34,8 +34,8 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 -HS_MINOR_VER=40 -HS_BUILD_NUMBER=25 +HS_MINOR_VER=45 +HS_BUILD_NUMBER=02 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 diff -r 584622a1ee06 -r 3bd13d57fbcc src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp --- a/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp Wed Apr 22 06:15:36 2015 +0100 +++ b/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp Wed Apr 22 06:17:52 2015 +0100 @@ -630,7 +630,12 @@ inline void MacroAssembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) { relocate(a.rspec(offset)); - ldf(w, a.base(), a.disp() + offset, d); + if (a.has_index()) { + assert(offset == 0, ""); + ldf(w, a.base(), a.index(), d); + } else { + ldf(w, a.base(), a.disp() + offset, d); + } } // returns if membar generates anything, obviously this code should mirror diff -r 584622a1ee06 -r 3bd13d57fbcc src/os/bsd/vm/perfMemory_bsd.cpp diff -r 584622a1ee06 -r 3bd13d57fbcc src/os/linux/vm/perfMemory_linux.cpp diff -r 584622a1ee06 -r 3bd13d57fbcc src/os/solaris/vm/perfMemory_solaris.cpp diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/classfile/defaultMethods.cpp --- a/src/share/vm/classfile/defaultMethods.cpp Wed Apr 22 06:15:36 2015 +0100 +++ b/src/share/vm/classfile/defaultMethods.cpp Wed Apr 22 06:17:52 2015 +0100 @@ -731,10 +731,12 @@ Method* m = iklass->find_method(_method_name, _method_signature); // private interface methods are not candidates for default methods // invokespecial to private interface methods doesn't use default method logic + // private class methods are not candidates for default methods, + // private methods do not override default methods, so need to perform + // default method inheritance without including private methods // The overpasses are your supertypes' errors, we do not include them // future: take access controls into account for superclass methods - if (m != NULL && !m->is_static() && !m->is_overpass() && - (!iklass->is_interface() || m->is_public())) { + if (m != NULL && !m->is_static() && !m->is_overpass() && !m->is_private()) { if (_family == NULL) { _family = new StatefulMethodFamily(); } @@ -745,6 +747,9 @@ } else { // This is the rule that methods in classes "win" (bad word) over // methods in interfaces. This works because of single inheritance + // private methods in classes do not "win", they will be found + // first on searching, but overriding for invokevirtual needs + // to find default method candidates for the same signature _family->set_target_if_empty(m); } } diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/code/dependencies.cpp diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/code/dependencies.hpp diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/memory/referenceProcessor.cpp --- a/src/share/vm/memory/referenceProcessor.cpp Wed Apr 22 06:15:36 2015 +0100 +++ b/src/share/vm/memory/referenceProcessor.cpp Wed Apr 22 06:17:52 2015 +0100 @@ -252,7 +252,7 @@ // Cleaner references to be temporary, and don't want to deal with // possible incompatibilities arising from making it more visible. phantom_count += - process_discovered_reflist(_discoveredCleanerRefs, NULL, false, + process_discovered_reflist(_discoveredCleanerRefs, NULL, true, is_alive, keep_alive, complete_gc, task_executor); } diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/oops/instanceKlass.cpp diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/oops/instanceKlass.hpp diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/oops/klassVtable.cpp --- a/src/share/vm/oops/klassVtable.cpp Wed Apr 22 06:15:36 2015 +0100 +++ b/src/share/vm/oops/klassVtable.cpp Wed Apr 22 06:17:52 2015 +0100 @@ -401,13 +401,15 @@ // get super_klass for method_holder for the found method InstanceKlass* super_klass = super_method->method_holder(); - if (is_default + // private methods are also never overridden + if (!super_method->is_private() && + (is_default || ((super_klass->is_override(super_method, target_loader, target_classname, THREAD)) || ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) && ((super_klass = find_transitive_override(super_klass, target_method, i, target_loader, target_classname, THREAD)) - != (InstanceKlass*)NULL)))) + != (InstanceKlass*)NULL))))) { // Package private methods always need a new entry to root their own // overriding. They may also override other methods. @@ -689,9 +691,15 @@ // check if a method is a miranda method, given a class's methods table, // its default_method table and its super // Miranda methods are calculated twice: -// first: before vtable size calculation: including abstract and default +// first: before vtable size calculation: including abstract and superinterface default +// We include potential default methods to give them space in the vtable. +// During the first run, the default_methods list is empty // This is seen by default method creation -// Second: recalculated during vtable initialization: only abstract +// Second: recalculated during vtable initialization: only include abstract methods. +// During the second run, default_methods is set up, so concrete methods from +// superinterfaces with matching names/signatures to default_methods are already +// in the default_methods list and do not need to be appended to the vtable +// as mirandas // This is seen by link resolution and selection. // "miranda" means not static, not defined by this class. // private methods in interfaces do not belong in the miranda list. @@ -706,8 +714,9 @@ } Symbol* name = m->name(); Symbol* signature = m->signature(); + Method* mo; - if (InstanceKlass::find_instance_method(class_methods, name, signature) == NULL) { + if ((mo = InstanceKlass::find_instance_method(class_methods, name, signature)) == NULL) { // did not find it in the method table of the current class if ((default_methods == NULL) || InstanceKlass::find_method(default_methods, name, signature) == NULL) { @@ -716,7 +725,7 @@ return true; } - Method* mo = InstanceKlass::cast(super)->lookup_method(name, signature); + mo = InstanceKlass::cast(super)->lookup_method(name, signature); while (mo != NULL && mo->access_flags().is_static() && mo->method_holder() != NULL && mo->method_holder()->super() != NULL) @@ -728,6 +737,18 @@ return true; } } + } else { + // if the local class has a private method, the miranda will not + // override it, so a vtable slot is needed + if (mo->access_flags().is_private()) { + + // Second round, weed out any superinterface methods that turned + // into default methods, i.e. were concrete not abstract in the end + if ((default_methods == NULL) || + InstanceKlass::find_method(default_methods, name, signature) == NULL) { + return true; + } + } } return false; diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/runtime/arguments.cpp --- a/src/share/vm/runtime/arguments.cpp Wed Apr 22 06:15:36 2015 +0100 +++ b/src/share/vm/runtime/arguments.cpp Wed Apr 22 06:17:52 2015 +0100 @@ -2310,7 +2310,7 @@ "G1ConcMarkStepDurationMillis"); status = status && verify_interval(G1ConcRSHotCardLimit, 0, max_jubyte, "G1ConcRSHotCardLimit"); - status = status && verify_interval(G1ConcRSLogCacheSize, 0, 31, + status = status && verify_interval(G1ConcRSLogCacheSize, 0, 27, "G1ConcRSLogCacheSize"); status = status && verify_interval(StringDeduplicationAgeThreshold, 1, markOopDesc::max_age, "StringDeduplicationAgeThreshold"); diff -r 584622a1ee06 -r 3bd13d57fbcc src/share/vm/utilities/vmError.cpp