Date: Sun, 5 May 2013 20:10:26 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317431 - in head/java/openjdk7: . files Message-ID: <201305052010.r45KAQv0031393@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun May 5 20:10:26 2013 New Revision: 317431 URL: http://svnweb.freebsd.org/changeset/ports/317431 Log: . Update to 7u21. Deleted: head/java/openjdk7/files/patch-zzz-make-sun-awt-Makefile Modified: head/java/openjdk7/Makefile head/java/openjdk7/files/patch-set Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Sun May 5 19:57:45 2013 (r317430) +++ head/java/openjdk7/Makefile Sun May 5 20:10:26 2013 (r317431) @@ -7,7 +7,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ http://download.java.net/jaxp/1.4.5/:jaxp \ @@ -41,8 +40,8 @@ DEBUG_DESC= Enable extra debugging info POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data -PORT_MINOR_VERSION= 17 -PORT_BUILD_NUMBER= 02 +PORT_MINOR_VERSION= 21 +PORT_BUILD_NUMBER= 11 JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 6 JDK_BUILD_NUMBER= 24 Modified: head/java/openjdk7/files/patch-set ============================================================================== --- head/java/openjdk7/files/patch-set Sun May 5 19:57:45 2013 (r317430) +++ head/java/openjdk7/files/patch-set Sun May 5 20:10:26 2013 (r317431) @@ -1,5 +1,5 @@ --- .hgtags 2012-08-10 09:07:00.000000000 -0700 -+++ .hgtags 2013-03-09 08:44:35.000000000 -0800 ++++ .hgtags 2013-05-05 09:39:37.000000000 -0700 @@ -123,6 +123,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 @@ -8,7 +8,7 @@ 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 -@@ -197,5 +198,46 @@ +@@ -197,5 +198,69 @@ 29f6fb1833eb2a696b95e8985126f2d70f511a82 jdk7u6-b21 31cdab09d719fe60876c7f3a472386c1455d93e2 jdk7u6-b22 d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23 @@ -16,6 +16,7 @@ -d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02 +e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24 +f5f546dba006778854e7a81141fc1b44acd257a4 jdk7u6-b30 ++43775eae8df6c874fb3631c86009505cf3821b1f jdk7u6-b31 +43775eae8df6c874fb3631c86009505cf3821b1f jdk7u7-b10 +a380c75873bfb578e605d4362edb18c08698cc3e jdk7u7-b30 +d7f2b3949f9c9ff1115ea61c496d3cd4c62e2759 jdk7u7-b11 @@ -29,6 +30,8 @@ +dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02 +3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04 +d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05 ++81f8b620894e275012a1b447f13319b7d2148b28 jdk7u9-b31 ++d247cdeb828f4463b55ea53c4b2d6346f7706c3c jdk7u9-b32 +d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10 +5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11 +48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12 @@ -39,8 +42,11 @@ +494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17 +dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18 +b5fb925394331313dbe3859fdc408bfd37193476 jdk7u10-b30 ++337ce65c8c356766212812b78f49f5632995987d jdk7u10-b31 +c2d5141baeda6c9b5bbc83c21eff9c3940fefae4 jdk7u11-b20 +168aa0f1417b3651a955ae66068dc148b660f829 jdk7u11-b21 ++7c0710ed65b097d415f772ff4fb58c4822890aa3 jdk7u11-b32 ++61cee7a518a4ae05439490ec388c3ab1d1d899f2 jdk7u11-b33 +c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u11-b03 +0b418e2ccf9093718609144689d1a8b316ad951f jdk7u11-b04 +e127e6c94b56f7348df67d9672c16a7dc9c5ec5e jdk7u11-b05 @@ -54,11 +60,28 @@ +0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01 +0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02 +25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30 ++5c1b2900a65b5ebe9d2a5c9b48903081c8196b04 jdk7u15-b31 ++e7adbfbcd837ad4e9f88db45612e5704b7a249fd jdk7u15-b33 +f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03 +2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32 +0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01 ++8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02 ++933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30 ++790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31 ++527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01 ++bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02 ++20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03 ++d2b1fdd8ee0affe640c7493ab3ae04fcc1961446 jdk7u21-b04 ++2d6657f92359d1d46b355fd0c99b8aa5f34832e4 jdk7u21-b05 ++14522481739dc6981beb5cc55d543dcc62cda067 jdk7u21-b06 ++0df382e8c17bf817d55fc8759c7f5c9e9d0337f0 jdk7u21-b07 ++1aff32a21aba64c3767e9a72ebf1b8ba490e99ec jdk7u21-b08 ++a2e0099b4cf70be026a7a0ba7918fcd71d57fdce jdk7u21-b09 ++602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10 ++fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11 ++450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30 --- corba/.hgtags 2012-08-10 09:09:50.000000000 -0700 -+++ corba/.hgtags 2013-03-09 08:44:37.000000000 -0800 ++++ corba/.hgtags 2013-05-05 09:39:37.000000000 -0700 @@ -123,6 +123,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 @@ -67,7 +90,7 @@ 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 -@@ -197,5 +198,46 @@ +@@ -197,5 +198,69 @@ 353c15c4bc371f2f8258344c988d1403477cc140 jdk7u6-b21 793b80c0316fcafa18668bced26acb41af3be07d jdk7u6-b22 2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23 @@ -75,6 +98,7 @@ -d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02 +02512f61591f55d84458d1ea4ce84eecb7324f89 jdk7u6-b24 +8b20875b3faa01ef56331045de88747df278eaeb jdk7u6-b30 ++d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u6-b31 +d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u7-b10 +496baf62d0550c704505b0ff6f390279f6a569e0 jdk7u7-b30 +e57e4274a3575f278115cc8ef03c5bdf3c43a7ed jdk7u7-b11 @@ -88,6 +112,8 @@ +ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02 +268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04 +a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05 ++b426254b45bcd7cdb38003497fdd4168e366d3cb jdk7u9-b31 ++0fa70374aa257929e2541e57c55c4cdebec91fd4 jdk7u9-b32 +ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10 +a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11 +e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12 @@ -98,8 +124,11 @@ +57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17 +f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18 +22cf8bc2ec47498fe548b308a81be0486dd7e3d0 jdk7u10-b30 ++2723612f5983e7d65490d7d4a3d8577026448736 jdk7u10-b31 +e7952daece16b27d69cb78f6912407c3bbaf8e83 jdk7u11-b20 +dff0f0272891b1d53497d9525567959b73476ff9 jdk7u11-b21 ++24f8cb8a0a615686f8baba4d746514bae92f064d jdk7u11-b32 ++4bfef14df261d69dc32e37d189e12e3fa572a83c jdk7u11-b33 +96a3c68e5741dc9ab5cb0da426511eb15fd29ede jdk7u11-b03 +1413b173730f4796fca42c89eeb804a5935b0264 jdk7u11-b04 +5c49a17bc15f4fd4722746788f5130df132cd038 jdk7u11-b05 @@ -113,11 +142,28 @@ +622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01 +30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02 +7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30 ++3714b558333e1089e2649ead8586873abd9c0ed1 jdk7u15-b31 ++f0c038610b6da1a0d4214b730aa6cb17b64d0a3b jdk7u15-b33 +e5b996dabec6ac6aa12705ce678642605ea9d476 jdk7u15-b03 +b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32 +94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01 ++e82d31e1f1189ae6f02d6855f0cd78074599b2e1 jdk7u17-b02 ++d4366e557c4c5af62a94fc9885aed87c99abc848 jdk7u17-b30 ++a6f066dd2cd526da73070d1e46c9b1e1ab1a6756 jdk7u17-b31 ++f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u21-b01 ++17ecd70a2247ed86a095aae9f1a201fa7feea861 jdk7u21-b02 ++bf0877613aeba816d5f18ea6316d535819f628e9 jdk7u21-b03 ++3e39240d7314e82b3ccff3b2a64413be9c0b6665 jdk7u21-b04 ++f5a291dc9d219f68a2d4bcc72c65c014e9ec3b8b jdk7u21-b05 ++94f2ebfccc5e057169284bb2c858296b235868ea jdk7u21-b06 ++23a57aceeb69e688f8ce8b8361fad3a49cf4ac5f jdk7u21-b07 ++ebedf04bfffe289e8bf9661b38f73ca6c0dad17c jdk7u21-b08 ++b8f92ad1f0cc86d8571a0e23192e667f0ef8e421 jdk7u21-b09 ++b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10 ++61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11 ++3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30 --- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2012-08-10 09:09:53.000000000 -0700 -+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2013-03-09 08:44:36.000000000 -0800 ++++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. @@ -157,7 +203,7 @@ com/sun/corba/se/impl/orbutil/closure/Constant.java \ com/sun/corba/se/impl/orbutil/concurrent/Sync.java \ --- corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2012-08-10 09:10:11.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. @@ -179,7 +225,7 @@ ServerCallback(ORB orb, Method installMethod, Method uninstallMethod, --- corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2012-08-10 09:10:12.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. @@ -206,7 +252,7 @@ classTC.setCaching(true); // Update the cache --- corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2012-08-10 09:10:15.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -302,7 +348,7 @@ value = valueHandler.readValue(parent, indirection, --- corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2012-08-10 09:10:15.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -350,7 +396,7 @@ Serializable key = object; --- corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java 2012-08-10 09:10:18.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. @@ -386,7 +432,7 @@ Stack repIds = new Stack(); --- corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2012-08-10 09:10:18.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. @@ -572,7 +618,7 @@ /** --- corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2012-08-10 09:10:19.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. @@ -728,7 +774,7 @@ } } --- corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java 2012-08-10 09:10:19.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved. @@ -752,7 +798,7 @@ throws ClassNotFoundException { --- corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2012-08-10 09:10:23.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2013-05-05 09:39:34.000000000 -0700 @@ -112,6 +112,9 @@ import com.sun.corba.se.impl.orbutil.ORBClassLoader; import com.sun.corba.se.impl.logging.UtilSystemException; @@ -774,7 +820,7 @@ private UtilSystemException utilWrapper = UtilSystemException.get( CORBALogDomains.RPC_ENCODING); --- corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-10 09:10:31.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-05-05 09:39:34.000000000 -0700 @@ -840,7 +840,7 @@ // backward compatability 4365188 CodeBase cb; @@ -1042,7 +1088,7 @@ - } -} --- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java 2012-08-10 09:10:33.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. @@ -1099,7 +1145,7 @@ * a foreign (non-JavaSoft) ORB. Note: If passed the ORBSingleton, this * will return false. --- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2012-08-10 09:10:33.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. @@ -1695,7 +1741,7 @@ - } -} --- corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java 2012-08-10 09:10:34.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java 2013-05-05 09:39:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. @@ -4169,7 +4215,7 @@ - } -} --- corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2012-08-10 09:11:09.000000000 -0700 -+++ corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2013-05-05 09:39:34.000000000 -0700 @@ -98,6 +98,7 @@ import com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl ; @@ -4255,7 +4301,7 @@ // End of file. --- corba/src/share/classes/sun/corba/JavaCorbaAccess.java 1969-12-31 16:00:00.000000000 -0800 -+++ corba/src/share/classes/sun/corba/JavaCorbaAccess.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/sun/corba/JavaCorbaAccess.java 2013-05-05 09:39:35.000000000 -0700 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -4290,7 +4336,7 @@ + public ValueHandlerImpl newValueHandlerImpl(); +} --- corba/src/share/classes/sun/corba/SharedSecrets.java 1969-12-31 16:00:00.000000000 -0800 -+++ corba/src/share/classes/sun/corba/SharedSecrets.java 2013-03-09 08:44:36.000000000 -0800 ++++ corba/src/share/classes/sun/corba/SharedSecrets.java 2013-05-05 09:39:35.000000000 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -4352,28 +4398,8 @@ + } + +} ---- get_source.sh 2012-08-10 09:07:01.000000000 -0700 -+++ get_source.sh 2013-01-15 23:01:23.000000000 -0800 -@@ -1,7 +1,7 @@ - #!/bin/sh - - # --# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # - # This code is free software; you can redistribute it and/or modify it -@@ -26,7 +26,7 @@ - # - - # Get clones of all nested repositories --sh ./make/scripts/hgforest.sh clone $* -+sh ./make/scripts/hgforest.sh clone - - # Update all existing repositories to the latest sources - sh ./make/scripts/hgforest.sh pull -u --- hotspot/.hgtags 2012-08-10 09:20:36.000000000 -0700 -+++ hotspot/.hgtags 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/.hgtags 2013-05-05 09:39:19.000000000 -0700 @@ -182,6 +182,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 @@ -4382,7 +4408,7 @@ 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 -@@ -318,5 +319,46 @@ +@@ -318,5 +319,69 @@ 02a6c89432d724119565f9ba25672829b136fc5f jdk7u6-b21 a79d86eef6ac995a1fc35554f082f3a61abe9ae0 jdk7u6-b22 df57f6208cb76b4e8d1a0bd0eea3d2ad577cb79b jdk7u6-b23 @@ -4390,6 +4416,7 @@ -528502f930967f70c320472a002418f1e38029e0 jdk7u8-b02 +b03c2687fb16514652e79261ad68d2c601dcee62 jdk7u6-b24 +cffde29ea7cc8647f17002a4d0e94065dcd82839 jdk7u6-b30 ++7566374c3c89b7d99be9bcdb9342283a3bea6930 jdk7u6-b31 +f7933fecea9aa494e4032e17ff07e5fcec4b5961 jdk7u7-b10 +eeef33dc4b40f9ba50c4c9b1ac61b30f0f2523bf jdk7u7-b30 +f1551c70c7f598b7049bcc33e530fc738a81c7a4 jdk7u7-b11 @@ -4403,6 +4430,8 @@ +ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u9-b02 +ed42837374ac730ddaf2fd28814017c665634a8b jdk7u9-b04 +da4aa289ac100017f850ed4d492e8054db6a1e28 jdk7u9-b05 ++8eaa45ed5f804199c0823b409dc37f72e808926f jdk7u9-b31 ++ea83168282c8c3a9f4a8ca723cc86972a3188d58 jdk7u9-b32 +d2e25680db9d4209b3f0f51e5c848284cedea508 jdk7u10-b10 +d37fd995683ab5bc2d941648ce7bf8bd194732f2 jdk7u10-b11 +f26f3d92e6d9ef7842b2d785f92439dbb15e670e jdk7u10-b12 @@ -4413,8 +4442,11 @@ +5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17 +78c7e1b4a006342230e04fbb73f637834207abef jdk7u10-b18 +c6b78bbaf6976197ead9d5aa3f65e0224cd13541 jdk7u10-b30 ++07f7daeb261073a4a2946d988979ee65ba8ed753 jdk7u10-b31 +25a92b94ad538963d009bf8a53ce548e13f55c82 jdk7u11-b20 +7a2cf85fc36e845db9ccb2a22af195c70af33bdf jdk7u11-b21 ++06b5c3f663b81f11da2080a91d215a96ae431f84 jdk7u11-b32 ++abb5b690122caabf09f93958c747358cc22f8a59 jdk7u11-b33 +db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03 +4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04 +f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05 @@ -4428,11 +4460,28 @@ +5fbe0cae3a2a78a73946cfd08c56a64860f1afd9 jdk7u15-b01 +30d72c9abb560bc424d16d96bfd396ccd3c62cbc jdk7u15-b02 +221c64550c5b4411d78b63820835de1a8cd0c118 jdk7u15-b30 ++0b905a04f573565515aa8614085099abd73dcac4 jdk7u15-b31 ++8b349f332a66ebe5982b5680c85f903efb03da8e jdk7u15-b33 +5b55cef461b034766f05a46640caa123aa4247d4 jdk7u15-b03 +34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u15-b32 +a4dfda7a2655209abb170b2fa4914dbbba89bcd3 jdk7u17-b01 ++0d82bf449a610602b6e9ddcc9e076839d5351449 jdk7u17-b02 ++7b357c079370e2fd324c229f2e24c982915c80a0 jdk7u17-b30 ++22b6fd616cfe61774525a944f162bf5e7c418f03 jdk7u17-b31 ++be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u21-b01 ++5119d89c7cc844190c0799dca85710e7592d42e7 jdk7u21-b02 ++ad14169fb640ca532193cca0fd6e14910f226075 jdk7u21-b03 ++c954aab38a7f8f62e33ae5103494576f67fc36d9 jdk7u21-b04 ++0e8e9d990d91dc0f8b8807bb82c090de3264c809 jdk7u21-b05 ++beeb3d6b76f06d9f60c31d6c5b9e04d82f01ad79 jdk7u21-b06 ++663b5c744e82d1c884048cd9b38f625e52004773 jdk7u21-b07 ++87e9bb582938552180b024dd99bc5166816f3921 jdk7u21-b08 ++1f195ee7856aecb6527bc5c957f66e1960e51a12 jdk7u21-b09 ++d4a4c2bd389abcd80c25d20e0ffb7d5cee356715 jdk7u21-b10 ++d07dafb51e1d75f110a3c506c250d995235acca6 jdk7u21-b11 ++a977dedec81c346247631ead6f3364c76949d67a jdk7u21-b30 --- hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-08-10 09:21:14.000000000 -0700 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-05-05 09:39:09.000000000 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.debugger.windbg.*; @@ -4442,7 +4491,7 @@ import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; --- hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-08-10 09:21:38.000000000 -0700 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-05-05 09:39:09.000000000 -0700 @@ -35,6 +35,7 @@ import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; @@ -4452,7 +4501,7 @@ import sun.jvm.hotspot.livejvm.*; import sun.jvm.hotspot.memory.*; --- hotspot/make/bsd/Makefile 2012-08-10 09:22:55.000000000 -0700 -+++ hotspot/make/bsd/Makefile 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/Makefile 2013-05-05 09:39:09.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -4483,7 +4532,7 @@ # Synonyms for win32-like targets. compiler2: jvmg product --- hotspot/make/bsd/makefiles/buildtree.make 2012-08-10 09:22:57.000000000 -0700 -+++ hotspot/make/bsd/makefiles/buildtree.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/buildtree.make 2013-05-05 09:39:09.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -4518,7 +4567,7 @@ .dbxrc: $(BUILDTREE_MAKE) @echo Creating $@ ... --- hotspot/make/bsd/makefiles/defs.make 2012-08-10 09:22:57.000000000 -0700 -+++ hotspot/make/bsd/makefiles/defs.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/defs.make 2013-05-05 09:39:09.000000000 -0700 @@ -86,7 +86,7 @@ VM_PLATFORM = bsd_i486 HS_ARCH = x86 @@ -4693,7 +4742,7 @@ ADD_SA_BINARIES/ia64 = ADD_SA_BINARIES/arm = --- hotspot/make/bsd/makefiles/gcc.make 2012-08-10 09:22:57.000000000 -0700 -+++ hotspot/make/bsd/makefiles/gcc.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/gcc.make 2013-05-05 09:39:09.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -4751,7 +4800,7 @@ + STRIP = strip +endif --- hotspot/make/bsd/makefiles/jsig.make 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/jsig.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/jsig.make 2013-05-05 09:39:09.000000000 -0700 @@ -36,9 +36,16 @@ LIBJSIG_G = lib$(JSIG_G).so endif @@ -4805,7 +4854,7 @@ .PHONY: install_jsig --- hotspot/make/bsd/makefiles/launcher.make 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/launcher.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/launcher.make 2013-05-05 09:39:09.000000000 -0700 @@ -50,7 +50,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -4816,7 +4865,7 @@ # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a # freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting --- hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/mapfile-vers-debug 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/mapfile-vers-debug 2013-05-05 09:39:09.000000000 -0700 @@ -221,6 +221,7 @@ JVM_SetArrayElement; JVM_SetClassSigners; @@ -4851,7 +4900,7 @@ JVM_AccessVMBooleanFlag; JVM_AccessVMIntFlag; --- hotspot/make/bsd/makefiles/mapfile-vers-product 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/mapfile-vers-product 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/mapfile-vers-product 2013-05-05 09:39:09.000000000 -0700 @@ -221,6 +221,7 @@ JVM_SetArrayElement; JVM_SetClassSigners; @@ -4886,7 +4935,7 @@ jio_fprintf; jio_printf; --- hotspot/make/bsd/makefiles/ppc.make 2012-08-10 09:22:58.000000000 -0700 -+++ hotspot/make/bsd/makefiles/ppc.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/ppc.make 2013-05-05 09:39:09.000000000 -0700 @@ -28,3 +28,6 @@ # Must also specify if CPU is big endian CFLAGS += -DVM_BIG_ENDIAN @@ -4895,7 +4944,7 @@ +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 +endif --- hotspot/make/bsd/makefiles/saproc.make 2012-08-10 09:22:59.000000000 -0700 -+++ hotspot/make/bsd/makefiles/saproc.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/saproc.make 2013-05-05 09:39:09.000000000 -0700 @@ -36,6 +36,11 @@ LIBSAPROC_G = lib$(SAPROC_G).so endif @@ -4953,7 +5002,7 @@ fi --- hotspot/make/bsd/makefiles/vm.make 2012-08-10 09:22:59.000000000 -0700 -+++ hotspot/make/bsd/makefiles/vm.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/bsd/makefiles/vm.make 2013-05-05 09:39:09.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -5061,7 +5110,7 @@ #---------------------------------------------------------------------- --- hotspot/make/hotspot_version 2012-08-10 09:23:01.000000000 -0700 -+++ hotspot/make/hotspot_version 2013-03-09 08:44:38.000000000 -0800 ++++ hotspot/make/hotspot_version 2013-05-05 09:39:09.000000000 -0700 @@ -31,11 +31,11 @@ # @@ -5072,13 +5121,13 @@ HS_MAJOR_VER=23 -HS_MINOR_VER=2 -HS_BUILD_NUMBER=09 -+HS_MINOR_VER=7 ++HS_MINOR_VER=21 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 --- hotspot/make/solaris/makefiles/defs.make 2012-08-10 09:23:12.000000000 -0700 -+++ hotspot/make/solaris/makefiles/defs.make 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/make/solaris/makefiles/defs.make 2013-05-05 09:39:09.000000000 -0700 @@ -194,8 +194,8 @@ endif ifeq ($(ARCH_DATA_MODEL), 32) @@ -5091,7 +5140,7 @@ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) --- hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2012-08-10 09:23:56.000000000 -0700 -+++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2013-05-05 09:39:10.000000000 -0700 @@ -71,7 +71,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -5105,7 +5154,7 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread --- hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp 2012-08-10 09:23:58.000000000 -0700 -+++ hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp 2013-01-16 08:57:49.000000000 -0800 ++++ hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp 2013-05-05 09:39:10.000000000 -0700 @@ -698,6 +698,17 @@ if (arg_slots.is_constant() && arg_slots.as_constant() == 0) return; @@ -5159,7 +5208,7 @@ // ... keep1 | dest | dest=42 | keep3 | RF... | collect | bounce_pc | __ jump_to_method_handle_entry(G3_method_handle, O1_scratch); --- hotspot/src/cpu/x86/vm/methodHandles_x86.cpp 2012-08-10 09:24:07.000000000 -0700 -+++ hotspot/src/cpu/x86/vm/methodHandles_x86.cpp 2013-01-16 08:57:49.000000000 -0800 ++++ hotspot/src/cpu/x86/vm/methodHandles_x86.cpp 2013-05-05 09:39:10.000000000 -0700 @@ -691,6 +691,14 @@ if (VerifyMethodHandles) verify_stack_move(_masm, arg_slots, -1); @@ -5236,7 +5285,7 @@ // Check the array type. Register rbx_klass = rbx_temp; --- hotspot/src/os/bsd/vm/decoder_bsd.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2013-05-05 09:39:10.000000000 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -5285,7 +5334,7 @@ +} + --- hotspot/src/os/bsd/vm/os_bsd.cpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/os/bsd/vm/os_bsd.cpp 2013-05-05 09:39:10.000000000 -0700 @@ -2341,14 +2341,14 @@ } @@ -5392,7 +5441,7 @@ void os::numa_make_global(char *addr, size_t bytes) { --- hotspot/src/os/bsd/vm/os_bsd.hpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.hpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/os/bsd/vm/os_bsd.hpp 2013-05-05 09:39:10.000000000 -0700 @@ -103,6 +103,12 @@ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); @@ -5407,7 +5456,7 @@ static void init_thread_fpu_state(); --- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2013-05-05 09:39:10.000000000 -0700 @@ -31,10 +31,22 @@ # include "atomic_bsd_x86.inline.hpp" # include "orderAccess_bsd_x86.inline.hpp" @@ -5432,7 +5481,7 @@ // System includes --- hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-08-10 09:24:18.000000000 -0700 -+++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2013-05-05 09:39:10.000000000 -0700 @@ -34,11 +34,26 @@ # include "orderAccess_bsd_x86.inline.hpp" # include "prefetch_bsd_x86.inline.hpp" @@ -5461,8 +5510,56 @@ // Contains inlined functions for class Thread and ThreadLocalStorage --- hotspot/src/os/posix/vm/os_posix.cpp 2012-08-10 09:24:20.000000000 -0700 -+++ hotspot/src/os/posix/vm/os_posix.cpp 2013-03-09 08:44:40.000000000 -0800 -@@ -110,11 +110,19 @@ ++++ hotspot/src/os/posix/vm/os_posix.cpp 2013-05-05 09:39:10.000000000 -0700 +@@ -75,6 +75,47 @@ + return; + } + ++// Multiple threads can race in this code, and can remap over each other with MAP_FIXED, ++// so on posix, unmap the section at the start and at the end of the chunk that we mapped ++// rather than unmapping and remapping the whole chunk to get requested alignment. ++char* os::reserve_memory_aligned(size_t size, size_t alignment) { ++ assert((alignment & (os::vm_allocation_granularity() - 1)) == 0, ++ "Alignment must be a multiple of allocation granularity (page size)"); ++ assert((size & (alignment -1)) == 0, "size must be 'alignment' aligned"); ++ ++ size_t extra_size = size + alignment; ++ assert(extra_size >= size, "overflow, size is too large to allow alignment"); ++ ++ char* extra_base = os::reserve_memory(extra_size, NULL, alignment); ++ ++ if (extra_base == NULL) { ++ return NULL; ++ } ++ ++ // Do manual alignment ++ char* aligned_base = (char*) align_size_up((uintptr_t) extra_base, alignment); ++ ++ // [ | | ] ++ // ^ extra_base ++ // ^ extra_base + begin_offset == aligned_base ++ // extra_base + begin_offset + size ^ ++ // extra_base + extra_size ^ ++ // |<>| == begin_offset ++ // end_offset == |<>| ++ size_t begin_offset = aligned_base - extra_base; ++ size_t end_offset = (extra_base + extra_size) - (aligned_base + size); ++ ++ if (begin_offset > 0) { ++ os::release_memory(extra_base, begin_offset); ++ } ++ ++ if (end_offset > 0) { ++ os::release_memory(extra_base + begin_offset + size, end_offset); ++ } ++ ++ return aligned_base; ++} ++ + void os::Posix::print_load_average(outputStream* st) { + st->print("load average:"); + double loadavg[3]; +@@ -110,11 +151,19 @@ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%d", rlim.rlim_cur); @@ -5482,8 +5579,47 @@ } void os::Posix::print_uname_info(outputStream* st) { +--- hotspot/src/os/windows/vm/os_windows.cpp 2012-08-10 09:24:30.000000000 -0700 ++++ hotspot/src/os/windows/vm/os_windows.cpp 2013-05-05 09:39:10.000000000 -0700 +@@ -2941,6 +2941,36 @@ + } + } + ++// Multiple threads can race in this code but it's not possible to unmap small sections of ++// virtual space to get requested alignment, like posix-like os's. ++// Windows prevents multiple thread from remapping over each other so this loop is thread-safe. ++char* os::reserve_memory_aligned(size_t size, size_t alignment) { ++ assert((alignment & (os::vm_allocation_granularity() - 1)) == 0, ++ "Alignment must be a multiple of allocation granularity (page size)"); ++ assert((size & (alignment -1)) == 0, "size must be 'alignment' aligned"); ++ ++ size_t extra_size = size + alignment; ++ assert(extra_size >= size, "overflow, size is too large to allow alignment"); ++ ++ char* aligned_base = NULL; ++ ++ do { ++ char* extra_base = os::reserve_memory(extra_size, NULL, alignment); ++ if (extra_base == NULL) { ++ return NULL; ++ } ++ // Do manual alignment ++ aligned_base = (char*) align_size_up((uintptr_t) extra_base, alignment); ++ ++ os::release_memory(extra_base, extra_size); ++ ++ aligned_base = os::reserve_memory(size, aligned_base); ++ ++ } while (aligned_base == NULL); ++ ++ return aligned_base; ++} ++ + char* os::reserve_memory(size_t bytes, char* addr, size_t alignment_hint) { + assert((size_t)addr % os::vm_allocation_granularity() == 0, + "reserve alignment"); --- hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2012-08-10 09:24:32.000000000 -0700 -+++ hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2013-05-05 09:39:10.000000000 -0700 @@ -52,7 +52,7 @@ /* Posix Thread IDs */ \ /**********************/ \ @@ -5494,7 +5630,7 @@ \ /* This must be the last entry, and must be present */ \ --- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-08-10 09:24:33.000000000 -0700 -+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2013-05-05 09:39:10.000000000 -0700 @@ -24,7 +24,7 @@ */ @@ -5505,7 +5641,7 @@ #endif --- hotspot/src/share/vm/compiler/compilerOracle.cpp 2012-08-10 09:26:19.000000000 -0700 -+++ hotspot/src/share/vm/compiler/compilerOracle.cpp 2013-01-16 08:57:49.000000000 -0800 ++++ hotspot/src/share/vm/compiler/compilerOracle.cpp 2013-05-05 09:39:12.000000000 -0700 @@ -575,7 +575,7 @@ char token[1024]; int pos = 0; @@ -5525,7 +5661,7 @@ token[pos++] = '\0'; parse_line(token); --- hotspot/src/share/vm/interpreter/linkResolver.cpp 2012-08-10 09:27:05.000000000 -0700 -+++ hotspot/src/share/vm/interpreter/linkResolver.cpp 2013-03-09 08:44:40.000000000 -0800 ++++ hotspot/src/share/vm/interpreter/linkResolver.cpp 2013-05-05 09:39:12.000000000 -0700 @@ -712,7 +712,7 @@ if (check_access && @@ -5535,8 +5671,332 @@ // 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> +--- hotspot/src/share/vm/oops/cpCacheOop.cpp 2012-08-10 09:27:18.000000000 -0700 ++++ hotspot/src/share/vm/oops/cpCacheOop.cpp 2013-05-05 09:39:12.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -470,6 +470,24 @@ + return false; + } + ++// a constant pool cache entry should never contain old or obsolete methods ++bool ConstantPoolCacheEntry::check_no_old_or_obsolete_entries() { ++ if (is_vfinal()) { ++ // virtual and final so _f2 contains method ptr instead of vtable index ++ methodOop m = (methodOop)_f2; ++ // Return false if _f2 refers to an old or an obsolete method. ++ // _f2 == NULL || !m->is_method() are just as unexpected here. ++ return (m != NULL && m->is_method() && !m->is_old() && !m->is_obsolete()); ++ } else if ((oop)_f1 == NULL || !((oop)_f1)->is_method()) { ++ // _f1 == NULL || !_f1->is_method() are OK here ++ return true; ++ } ++ ++ methodOop m = (methodOop)_f1; ++ // return false if _f1 refers to an old or an obsolete method ++ return (!m->is_old() && !m->is_obsolete()); ++} ++ + bool ConstantPoolCacheEntry::is_interesting_method_entry(klassOop k) { + if (!is_method_entry()) { + // not a method entry so not interesting by default +@@ -492,7 +510,7 @@ + } + + assert(m != NULL && m->is_method(), "sanity check"); +- if (m == NULL || !m->is_method() || m->method_holder() != k) { ++ if (m == NULL || !m->is_method() || (k != NULL && m->method_holder() != k)) { + // robustness for above sanity checks or method is not in + // the interesting class + return false; +@@ -577,3 +595,22 @@ + } + } + } ++ ++// the constant pool cache should never contain old or obsolete methods ++bool constantPoolCacheOopDesc::check_no_old_or_obsolete_entries() { ++ for (int i = 1; i < length(); i++) { ++ if (entry_at(i)->is_interesting_method_entry(NULL) && ++ !entry_at(i)->check_no_old_or_obsolete_entries()) { ++ return false; ++ } ++ } ++ return true; ++} ++ ++void constantPoolCacheOopDesc::dump_cache() { ++ for (int i = 1; i < length(); i++) { ++ if (entry_at(i)->is_interesting_method_entry(NULL)) { ++ entry_at(i)->print(tty, i); ++ } ++ } ++} +--- hotspot/src/share/vm/oops/cpCacheOop.hpp 2012-08-10 09:27:18.000000000 -0700 ++++ hotspot/src/share/vm/oops/cpCacheOop.hpp 2013-05-05 09:39:12.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -298,6 +298,7 @@ + // group don't print the klass name. + bool adjust_method_entry(methodOop old_method, methodOop new_method, + bool * trace_name_printed); ++ bool check_no_old_or_obsolete_entries(); + bool is_interesting_method_entry(klassOop k); + bool is_field_entry() const { return (_flags & (1 << hotSwapBit)) == 0; } + bool is_method_entry() const { return (_flags & (1 << hotSwapBit)) != 0; } +@@ -405,6 +406,8 @@ + // group don't print the klass name. + void adjust_method_entries(methodOop* old_methods, methodOop* new_methods, + int methods_length, bool * trace_name_printed); ++ bool check_no_old_or_obsolete_entries(); ++ void dump_cache(); + }; + + #endif // SHARE_VM_OOPS_CPCACHEOOP_HPP +--- hotspot/src/share/vm/oops/klassVtable.cpp 2012-08-10 09:27:23.000000000 -0700 ++++ hotspot/src/share/vm/oops/klassVtable.cpp 2013-05-05 09:39:12.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -640,11 +640,37 @@ + new_method->name()->as_C_string(), + new_method->signature()->as_C_string())); + } ++ // cannot 'break' here; see for-loop comment above. + } + } + } + } + ++// a vtable should never contain old or obsolete methods ++bool klassVtable::check_no_old_or_obsolete_entries() { ++ for (int i = 0; i < length(); i++) { ++ methodOop m = unchecked_method_at(i); ++ if (m != NULL && (m->is_old() || m->is_obsolete())) { ++ return false; ++ } ++ } ++ return true; ++} ++ ++void klassVtable::dump_vtable() { ++ tty->print_cr("vtable dump --"); ++ for (int i = 0; i < length(); i++) { ++ methodOop m = unchecked_method_at(i); ++ if (m != NULL) { ++ tty->print(" (%5d) ", i); ++ m->access_flags().print_on(tty); ++ tty->print(" -- "); ++ m->print_name(tty); ++ tty->cr(); ++ } ++ } ++} ++ + // CDS/RedefineClasses support - clear vtables so they can be reinitialized + void klassVtable::clear_vtable() { + for (int i = 0; i < _length; i++) table()[i].clear(); +@@ -994,13 +1020,42 @@ + new_method->name()->as_C_string(), + new_method->signature()->as_C_string())); + } +- break; ++ // cannot 'break' here; see for-loop comment above. + } + ime++; + } + } + } + ++// an itable should never contain old or obsolete methods ++bool klassItable::check_no_old_or_obsolete_entries() { ++ itableMethodEntry* ime = method_entry(0); ++ for (int i = 0; i < _size_method_table; i++) { ++ methodOop m = ime->method(); ++ if (m != NULL && (m->is_old() || m->is_obsolete())) { ++ return false; ++ } ++ ime++; ++ } ++ return true; ++} ++ ++void klassItable::dump_itable() { ++ itableMethodEntry* ime = method_entry(0); ++ tty->print_cr("itable dump --"); ++ for (int i = 0; i < _size_method_table; i++) { ++ methodOop m = ime->method(); ++ if (m != NULL) { ++ tty->print(" (%5d) ", i); ++ m->access_flags().print_on(tty); ++ tty->print(" -- "); ++ m->print_name(tty); ++ tty->cr(); ++ } ++ ime++; ++ } ++} ++ + + // Setup + class InterfaceVisiterClosure : public StackObj { +@@ -1287,33 +1342,6 @@ + tty->print_cr("%6d bytes total", total); + } + +-bool klassVtable::check_no_old_entries() { +- // Check that there really is no entry +- for (int i = 0; i < length(); i++) { +- methodOop m = unchecked_method_at(i); +- if (m != NULL) { +- if (m->is_old()) { +- return false; +- } +- } +- } +- return true; +-} +- +-void klassVtable::dump_vtable() { +- tty->print_cr("vtable dump --"); +- for (int i = 0; i < length(); i++) { +- methodOop m = unchecked_method_at(i); +- if (m != NULL) { +- tty->print(" (%5d) ", i); +- m->access_flags().print_on(tty); +- tty->print(" -- "); +- m->print_name(tty); +- tty->cr(); +- } +- } +-} +- + int klassItable::_total_classes; // Total no. of classes with itables + long klassItable::_total_size; // Total no. of bytes used for itables + +--- hotspot/src/share/vm/oops/klassVtable.hpp 2012-08-10 09:27:23.000000000 -0700 ++++ hotspot/src/share/vm/oops/klassVtable.hpp 2013-05-05 09:39:12.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -98,6 +98,8 @@ + // group don't print the klass name. + void adjust_method_entries(methodOop* old_methods, methodOop* new_methods, + int methods_length, bool * trace_name_printed); ++ bool check_no_old_or_obsolete_entries(); ++ void dump_vtable(); + + // Garbage collection + void oop_follow_contents(); +@@ -118,11 +120,6 @@ + void verify(outputStream* st, bool force = false); + static void print_statistics() PRODUCT_RETURN; + +-#ifndef PRODUCT +- bool check_no_old_entries(); +- void dump_vtable(); +-#endif +- + protected: + friend class vtableEntry; + private: +@@ -292,6 +289,8 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305052010.r45KAQv0031393>