/hg/icedtea7: Update to u10b08.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 26 06:53:03 PDT 2012
changeset 67d42446bc25 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=67d42446bc25
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Sep 26 14:52:49 2012 +0100
Update to u10b08.
2012-09-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(OPENJDK_VERSION): Bump to b08.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* hotspot.map: Update default to head of IcedTea7
forest HotSpot.
* patches/boot/ecj-diamond.patch:
Regenerated. Added new cases in javax.crypto.CryptoPermissions,
javax.crypto.JceSecurityManager and java.beans.Introspector.
* patches/boot/ecj-multicatch.patch:
Added new case in sun.tools.jconsole.Resources.
* patches/boot/ecj-stringswitch.patch:
Regenerated.
diffstat:
ChangeLog | 26 +
Makefile.am | 26 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 1114 ++++++++++++++++++----------------
patches/boot/ecj-multicatch.patch | 33 +
patches/boot/ecj-stringswitch.patch | 52 +-
6 files changed, 676 insertions(+), 577 deletions(-)
diffs (truncated from 3158 to 500 lines):
diff -r 1603e47bf631 -r 67d42446bc25 ChangeLog
--- a/ChangeLog Tue Sep 25 14:34:52 2012 +0200
+++ b/ChangeLog Wed Sep 26 14:52:49 2012 +0100
@@ -1,3 +1,29 @@
+2012-09-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b08.
+ (CORBA_CHANGESET): Update to IcedTea7 forest head.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * hotspot.map: Update default to head of IcedTea7
+ forest HotSpot.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Added new cases in javax.crypto.CryptoPermissions,
+ javax.crypto.JceSecurityManager and java.beans.Introspector.
+ * patches/boot/ecj-multicatch.patch:
+ Added new case in sun.tools.jconsole.Resources.
+ * patches/boot/ecj-stringswitch.patch:
+ Regenerated.
+
2012-09-25 Xerxes RÃ¥nby <xerxes at zafena.se>
JamVM
diff -r 1603e47bf631 -r 67d42446bc25 Makefile.am
--- a/Makefile.am Tue Sep 25 14:34:52 2012 +0200
+++ b/Makefile.am Wed Sep 26 14:52:49 2012 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b07
+OPENJDK_VERSION = b08
JDK_UPDATE_VERSION = 10
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 460b8758b9e4
-JAXP_CHANGESET = 5022489661f3
-JAXWS_CHANGESET = cf12218e2d86
-JDK_CHANGESET = 7458205a24cb
-LANGTOOLS_CHANGESET = b6aa87579acb
-OPENJDK_CHANGESET = d6cfb4b87935
+CORBA_CHANGESET = 7b663d107703
+JAXP_CHANGESET = 5534e1a3b332
+JAXWS_CHANGESET = b75161fe3bd2
+JDK_CHANGESET = 1c47442c7584
+LANGTOOLS_CHANGESET = 1045d2bf8428
+OPENJDK_CHANGESET = fc2e81562d86
-CORBA_SHA256SUM = a9f997e9b8b530a8155505bbb0ef83a2aac5cdea120f87196172f1402f98018c
-JAXP_SHA256SUM = efc733f72384008e3bb095420964b671eeecba02e7003bb50355e835f2495bf3
-JAXWS_SHA256SUM = 3aae6d0d757c460b4d9a5cbebf722fc81192d1dcebd25d4c709fe6b03c12d48d
-JDK_SHA256SUM = 9602aaa77634a7750afc63f65334ae26efc2b38ef822552e77cef456d681cb97
-LANGTOOLS_SHA256SUM = 166a06f7a56b5ae0eeb51d07b634e95e1c9c541875ea7ec3e529b72172cf875b
-OPENJDK_SHA256SUM = 237b638ca0a210524ae719c96d18909ab951830081078f842ce3afa5fd20b39d
+CORBA_SHA256SUM = 2c828476f2cfd1a9e3a5be7abf307c2087829ef6be626ae6b00f8c5eaf021760
+JAXP_SHA256SUM = e09f10dd7bac6ddd92016cf2397dea8a8b704dbfa0f27ca99f1a6de080412a7d
+JAXWS_SHA256SUM = b08dcd8f4796daab11b13417b036de4323bed79e8c790ad958a55a1a165f08b8
+JDK_SHA256SUM = f758775982b021f6e650d1092a9f5d9bd900311603207c2ff51eb99fd4b2b731
+LANGTOOLS_SHA256SUM = f3e06606db1725548d4b67ff7f1db4e07ed291a46ac99a3149df6e82bd508945
+OPENJDK_SHA256SUM = c107253e6ca56e07c65f7656a47ae04cd53a061de9b8a302552be44cc65d1394
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r 1603e47bf631 -r 67d42446bc25 hotspot.map
--- a/hotspot.map Tue Sep 25 14:34:52 2012 +0200
+++ b/hotspot.map Wed Sep 26 14:52:49 2012 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 08596d5d7dda c88abf4d9ab315e48a790ae184201efcd9b659c292b27570e3e606db585f2073
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot ede14825dbfa 3862e81ac99c464fda6f53898129ddbd1d62af63b7fc3ea06d21c4c9691da72e
zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot c159737dd826 c1e626ecf4e7118ac269923ef0b83f5f8d36b0e816b293197ffbf8dd5083fa8d
diff -r 1603e47bf631 -r 67d42446bc25 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Tue Sep 25 14:34:52 2012 +0200
+++ b/patches/boot/ecj-diamond.patch Wed Sep 26 14:52:49 2012 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-08-29 13:24:52.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-08-29 13:51:21.597693973 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-09-24 21:55:46.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-09-26 02:21:47.741128089 +0100
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-29 13:24:52.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-29 13:51:21.605694085 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-09-24 21:55:46.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-09-26 02:21:47.753128270 +0100
@@ -1316,7 +1316,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -23,8 +23,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-08-29 13:24:52.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-08-29 13:51:21.605694085 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-09-24 21:55:46.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-09-26 02:21:47.753128270 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +44,8 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-08-29 13:24:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-08-29 13:52:15.526449232 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-09-24 21:55:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-09-26 02:21:47.753128270 +0100
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -65,9 +65,9 @@
CACHE.put(actual, map);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-08-29 13:24:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-08-29 13:51:21.605694085 +0100
-@@ -103,9 +103,9 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-09-24 21:55:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-09-26 02:21:47.753128270 +0100
+@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -80,7 +80,7 @@
// Canonicalized lists of trivial attrs (Deprecated, etc.)
// are used by trimToSize, in order to reduce footprint
-@@ -115,7 +115,7 @@
+@@ -116,7 +116,7 @@
synchronized (canonLists) {
List<Attribute> cl = canonLists.get(al);
if (cl == null) {
@@ -89,7 +89,7 @@
cl.addAll(al);
cl = Collections.unmodifiableList(cl);
canonLists.put(al, cl);
-@@ -336,9 +336,9 @@
+@@ -337,9 +337,9 @@
public void addAttribute(Attribute a) {
if (attributes == null)
@@ -101,7 +101,7 @@
attributes.add(a);
}
-@@ -346,7 +346,7 @@
+@@ -347,7 +347,7 @@
if (attributes == null) return null;
if (!attributes.contains(a)) return null;
if (!(attributes instanceof ArrayList))
@@ -138,8 +138,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-08-29 13:50:51.345270734 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-09-26 02:14:39.446727849 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-09-26 02:24:51.519895668 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -169,7 +169,7 @@
// Well-known attributes:
protected final Attribute.Layout attrCodeEmpty;
-@@ -1713,16 +1713,16 @@
+@@ -1713,11 +1713,11 @@
protected final Attribute.Layout attrConstantValue;
// Mapping from Attribute.Layout to Integer (inverse of attrDefs)
@@ -183,15 +183,9 @@
{
for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) {
assert(attrIndexLimit[i] == 0);
- attrIndexLimit[i] = 32; // just for the sake of predefs.
-- attrDefs.set(i, new ArrayList<>(Collections.nCopies(
-+ attrDefs.set(i, new ArrayList<Attribute.Layout>(Collections.nCopies(
- attrIndexLimit[i], (Attribute.Layout)null)));
-
- }
@@ -1912,7 +1912,7 @@
- protected List<Attribute.Layout> getPredefinedAttrs(int ctype) {
+ protected List getPredefinedAttrs(int ctype) {
assert(attrIndexLimit[ctype] != 0);
- List<Attribute.Layout> res = new ArrayList<>(attrIndexLimit[ctype]);
+ List<Attribute.Layout> res = new ArrayList<Attribute.Layout>(attrIndexLimit[ctype]);
@@ -208,8 +202,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-08-29 13:50:51.209268832 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-09-26 02:14:39.310725828 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-09-26 02:21:47.753128270 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -220,8 +214,8 @@
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-08-29 13:24:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-09-24 21:55:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-09-26 02:21:47.753128270 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -258,8 +252,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-08-29 13:24:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-09-24 21:55:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-09-26 02:21:47.753128270 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -270,9 +264,9 @@
Coding x1 = codeMap.get(x0);
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-08-29 13:24:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-08-29 13:51:21.609694141 +0100
-@@ -915,7 +915,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-09-24 21:55:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-09-26 02:21:47.753128270 +0100
+@@ -919,7 +919,7 @@
public static
Index[] partition(Index ix, int[] keys) {
// %%% Should move this into class Index.
@@ -281,7 +275,7 @@
Entry[] cpMap = ix.cpMap;
assert(keys.length == cpMap.length);
for (int i = 0; i < keys.length; i++) {
-@@ -926,7 +926,7 @@
+@@ -930,7 +930,7 @@
}
List<Entry> part = parts.get(key);
if (part == null) {
@@ -290,7 +284,7 @@
}
part.add(cpMap[i]);
}
-@@ -1133,7 +1133,7 @@
+@@ -1137,7 +1137,7 @@
void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) {
cpRefs.remove(null);
for (ListIterator<Entry> work =
@@ -300,8 +294,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-08-29 13:50:51.345270734 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-09-26 02:14:39.446727849 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-09-26 02:21:47.753128270 +0100
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -339,8 +333,8 @@
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-08-29 13:24:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-09-24 21:55:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-09-26 02:21:47.753128270 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -350,35 +344,9 @@
// initialize the list to null
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-08-29 13:24:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-08-29 13:51:21.609694141 +0100
-@@ -126,11 +126,11 @@
- public void setBytes(byte[] newBytes) {
- if (bytes == newBytes) return;
- ArrayList<Fixup> old = null;
-- assert((old = new ArrayList<>(this)) != null);
-+ assert((old = new ArrayList<Fixup>(this)) != null);
- if (bytes == null || newBytes == null) {
- // One or the other representations is deficient.
- // Construct a checkpoint.
-- ArrayList<Fixup> save = new ArrayList<>(this);
-+ ArrayList<Fixup> save = new ArrayList<Fixup>(this);
- clear();
- bytes = newBytes;
- addAll(save);
-@@ -138,7 +138,7 @@
- // assume newBytes is some sort of bitwise copy of the old bytes
- bytes = newBytes;
- }
-- assert(old.equals(new ArrayList<>(this)));
-+ assert(old.equals(new ArrayList<Fixup>(this)));
- }
-
- static final int LOC_SHIFT = 1;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-08-29 13:50:51.209268832 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-09-26 02:14:39.314725887 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-09-26 02:25:05.996114187 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -397,7 +365,7 @@
public List<Package.Class> getClasses() {
return classes;
-@@ -263,7 +263,7 @@
+@@ -264,7 +264,7 @@
if (olda == null)
return; // no SourceFile attr.
String obvious = getObviousSourceFile();
@@ -406,7 +374,7 @@
olda.visitRefs(this, VRM_PACKAGE, ref);
Utf8Entry sfName = (Utf8Entry) ref.get(0);
Attribute a = olda;
-@@ -291,7 +291,7 @@
+@@ -292,7 +292,7 @@
if (a != olda) {
if (verbose > 2)
Utils.log.fine("recoding obvious SourceFile="+obvious);
@@ -415,7 +383,7 @@
int where = newAttrs.indexOf(olda);
newAttrs.set(where, a);
setAttributes(newAttrs);
-@@ -321,7 +321,7 @@
+@@ -322,7 +322,7 @@
}
public void setInnerClasses(Collection<InnerClass> ics) {
@@ -424,7 +392,7 @@
// Edit the attribute list, if necessary.
Attribute a = getAttribute(attrInnerClassesEmpty);
if (innerClasses != null && a == null)
-@@ -340,7 +340,7 @@
+@@ -341,7 +341,7 @@
* with that of Package.this.allInnerClasses.
*/
public List<InnerClass> computeGloballyImpliedICs() {
@@ -433,7 +401,7 @@
{ // This block temporarily displaces this.innerClasses.
ArrayList<InnerClass> innerClassesSaved = innerClasses;
innerClasses = null; // ignore for the moment
-@@ -349,7 +349,7 @@
+@@ -350,7 +350,7 @@
}
ConstantPool.completeReferencesIn(cpRefs, true);
@@ -442,7 +410,7 @@
for (Entry e : cpRefs) {
// Restrict cpRefs to InnerClasses entries only.
if (!(e instanceof ClassEntry)) continue;
-@@ -365,7 +365,7 @@
+@@ -366,7 +366,7 @@
// This loop is structured this way so as to accumulate
// entries into impliedICs in an order which reflects
// the order of allInnerClasses.
@@ -451,7 +419,7 @@
for (InnerClass ic : allInnerClasses) {
// This one is locally relevant if it describes
// a member of the current class, or if the current
-@@ -408,8 +408,8 @@
+@@ -409,8 +409,8 @@
// Diff is A since I is empty.
}
// (I*A) is non-trivial
@@ -462,7 +430,7 @@
impliedICs.addAll(actualICs);
impliedICs.removeAll(center);
// Diff is now I^A = (I+A)-(I*A).
-@@ -538,7 +538,7 @@
+@@ -539,7 +539,7 @@
super(flags, descriptor);
assert(!descriptor.isMethod());
if (fields == null)
@@ -471,7 +439,7 @@
boolean added = fields.add(this);
assert(added);
order = fields.size();
-@@ -563,7 +563,7 @@
+@@ -564,7 +564,7 @@
super(flags, descriptor);
assert(descriptor.isMethod());
if (methods == null)
@@ -480,7 +448,7 @@
boolean added = methods.add(this);
assert(added);
}
-@@ -728,14 +728,14 @@
+@@ -732,14 +732,14 @@
}
// What non-class files are in this unit?
@@ -497,25 +465,16 @@
for (Class cls : classes) {
assert(cls.file.isClassStub());
classStubs.add(cls.file);
-@@ -749,7 +749,7 @@
- int modtime = NO_MODTIME;
- int options = 0; // random flag bits, such as deflate_hint
- Class stubClass; // if this is a stub, here's the class
-- ArrayList<byte[]> prepend = new ArrayList<>(); // list of byte[]
-+ ArrayList<byte[]> prepend = new ArrayList<byte[]>(); // list of byte[]
- java.io.ByteArrayOutputStream append = new ByteArrayOutputStream();
-
- File(Utf8Entry name) {
-@@ -852,7 +852,7 @@
+@@ -859,7 +859,7 @@
public InputStream getInputStream() {
InputStream in = new ByteArrayInputStream(append.toByteArray());
if (prepend.isEmpty()) return in;
- List<InputStream> isa = new ArrayList<>(prepend.size()+1);
+ List<InputStream> isa = new ArrayList<InputStream>(prepend.size()+1);
- for (byte[] bytes : prepend) {
+ for (Iterator i = prepend.iterator(); i.hasNext(); ) {
+ byte[] bytes = (byte[]) i.next();
isa.add(new ByteArrayInputStream(bytes));
- }
-@@ -888,7 +888,7 @@
+@@ -896,7 +896,7 @@
}
// Is there a globally declared table of inner classes?
@@ -524,7 +483,7 @@
Map<ClassEntry, InnerClass> allInnerClassesByThis;
public
-@@ -903,7 +903,7 @@
+@@ -911,7 +911,7 @@
allInnerClasses.addAll(ics);
// Make an index:
@@ -533,7 +492,7 @@
for (InnerClass ic : allInnerClasses) {
Object pic = allInnerClassesByThis.put(ic.thisClass, ic);
assert(pic == null); // caller must ensure key uniqueness!
-@@ -1290,7 +1290,7 @@
+@@ -1302,7 +1302,7 @@
// Use this before writing the class files.
void ensureAllClassFiles() {
@@ -543,8 +502,8 @@
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-08-29 13:50:51.349270790 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-08-29 13:51:21.609694141 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-09-26 02:14:39.446727849 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-09-26 02:23:17.530478725 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -631,15 +590,15 @@
bits = attrBits; // iterate again
for (int ai = 0; bits != 0; ai++) {
@@ -1596,7 +1596,7 @@
- void readAttrs(int ctype, Collection<? extends Attribute.Holder> holders)
- throws IOException {
+ @SuppressWarnings("unchecked")
+ void readAttrs(int ctype, Collection holders) throws IOException {
// Decode band values into attributes.
- Set<Attribute.Layout> sawDefs = new HashSet<>();
+ Set<Attribute.Layout> sawDefs = new HashSet<Attribute.Layout>();
ByteArrayOutputStream buf = new ByteArrayOutputStream();
- for (final Attribute.Holder h : holders) {
- if (h.attributes == null) continue;
-@@ -1799,7 +1799,7 @@
+ for (Iterator i = holders.iterator(); i.hasNext(); ) {
+ final Attribute.Holder h = (Attribute.Holder) i.next();
+@@ -1800,7 +1800,7 @@
// scratch buffer for collecting code::
byte[] buf = new byte[1<<12];
// record of all switch opcodes (these are variable-length)
@@ -648,7 +607,7 @@
for (int k = 0; k < allCodes.length; k++) {
Code c = allCodes[k];
scanOneMethod:
More information about the distro-pkg-dev
mailing list