/hg/icedtea: Bump to b136.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun May 1 10:12:43 PDT 2011
changeset e53fc64228c1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e53fc64228c1
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun May 01 18:12:29 2011 +0100
Bump to b136.
2011-04-29 Andrew John Hughes <ahughes at redhat.com>
* patches/boot/icedtea-dyn.patch: Dropped;
java.lang.invoke now compiled in bootstrap mode.
* patches/icedtea-demo-swingapplet.patch: Dropped, upstream.
* patches/icedtea-tools.patch; Dropped, obsolete.
* Makefile.am: (OPENJDK_VERSION): Bump to b136.
(CORBA_CHANGESET): Updated. (HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM):
Likewise. (JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Dropped
removed patches. (ICEDTEA_BOOT_PATCHES): Drop icedtea-
dyn.patch and add ecj-autoboxing.patch.
* patches/boot/ecj-autoboxing.patch: New patch to avoid trying
to cast to primitive types from Object.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-stringswitch.patch,
* patches/boot/ecj-trywithresources.patch: Remove additional
cases introduced in b131-b136.
* patches/boot/fontconfig.patch,
* patches/boot/jar.patch,
* patches/boot/xbootclasspath.patch,
* patches/cacao/arch.patch,
* patches/debian/icedtea-uname.patch,
* patches/hotspot/default/icedtea-gcc-suffix.patch,
* patches/hotspot/default/icedtea-params-cast-size_t.patch,
* patches/icedtea-libraries.patch,
* patches/icedtea-rhino.patch,
* patches/icedtea-update-bootclasspath.patch,
* patches/sh4-support.patch: Updated to apply against b136.
diffstat:
ChangeLog | 50 +
Makefile.am | 40 +-
patches/boot/ecj-autoboxing.patch | 259 ++++
patches/boot/ecj-diamond.patch | 839 ++++++++------
patches/boot/ecj-stringswitch.patch | 69 +-
patches/boot/ecj-trywithresources.patch | 670 +++++++++++-
patches/boot/fontconfig.patch | 5 +-
patches/boot/icedtea-dyn.patch | 11 -
patches/boot/jar.patch | 23 -
patches/boot/xbootclasspath.patch | 34 +-
patches/cacao/arch.patch | 49 +-
patches/debian/icedtea-uname.patch | 14 +-
patches/hotspot/default/icedtea-gcc-suffix.patch | 13 +-
patches/hotspot/default/icedtea-params-cast-size_t.patch | 50 +-
patches/icedtea-demo-swingapplet.patch | 10 -
patches/icedtea-libraries.patch | 130 +-
patches/icedtea-rhino.patch | 31 +-
patches/icedtea-tools.patch | 79 -
patches/icedtea-update-bootclasspath.patch | 10 +-
patches/sh4-support.patch | 67 +-
20 files changed, 1720 insertions(+), 733 deletions(-)
diffs (truncated from 5645 to 500 lines):
diff -r 0f9261320112 -r e53fc64228c1 ChangeLog
--- a/ChangeLog Thu Apr 21 20:12:07 2011 -0400
+++ b/ChangeLog Sun May 01 18:12:29 2011 +0100
@@ -1,3 +1,53 @@
+2011-04-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/boot/icedtea-dyn.patch:
+ Dropped; java.lang.invoke now compiled in
+ bootstrap mode.
+ * patches/icedtea-demo-swingapplet.patch:
+ Dropped, upstream.
+ * patches/icedtea-tools.patch;
+ Dropped, obsolete.
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b136.
+ (CORBA_CHANGESET): Updated.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (JAXP_DROP_ZIP): Likewise.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Dropped removed patches.
+ (ICEDTEA_BOOT_PATCHES): Drop icedtea-dyn.patch
+ and add ecj-autoboxing.patch.
+ * patches/boot/ecj-autoboxing.patch:
+ New patch to avoid trying to cast to primitive types
+ from Object.
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-stringswitch.patch,
+ * patches/boot/ecj-trywithresources.patch:
+ Remove additional cases introduced in b131-b136.
+ * patches/boot/fontconfig.patch,
+ * patches/boot/jar.patch,
+ * patches/boot/xbootclasspath.patch,
+ * patches/cacao/arch.patch,
+ * patches/debian/icedtea-uname.patch,
+ * patches/hotspot/default/icedtea-gcc-suffix.patch,
+ * patches/hotspot/default/icedtea-params-cast-size_t.patch,
+ * patches/icedtea-libraries.patch,
+ * patches/icedtea-rhino.patch,
+ * patches/icedtea-update-bootclasspath.patch,
+ * patches/sh4-support.patch:
+ Updated to apply against b136.
+
2011-04-21 Omair Majid <omajid at redhat.com>
* patches/bytebuffer-compact.patch: Drop patch. It only contained
diff -r 0f9261320112 -r e53fc64228c1 Makefile.am
--- a/Makefile.am Thu Apr 21 20:12:07 2011 -0400
+++ b/Makefile.am Sun May 01 18:12:29 2011 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b130
+OPENJDK_VERSION = b136
-CORBA_CHANGESET = 59f02c101698
-HOTSPOT_CHANGESET = 4071da7ef7b3
-JAXP_CHANGESET = b6f201c0649a
-JAXWS_CHANGESET = 4c04de31900b
-JDK_CHANGESET = 6753b79d7bb5
-LANGTOOLS_CHANGESET = 4659da7bff78
-OPENJDK_CHANGESET = d39d0c08731a
+CORBA_CHANGESET = b62418551e20
+HOTSPOT_CHANGESET = ef8632d52263
+JAXP_CHANGESET = 1c2f25bf36b1
+JAXWS_CHANGESET = 339c2d381d80
+JDK_CHANGESET = 1631a3dee8fc
+LANGTOOLS_CHANGESET = 8e26c4aee63c
+OPENJDK_CHANGESET = d4aea1a51d62
-CORBA_SHA256SUM = 4c6db5299947c3ed11a7f72da55a3cd89197c143f10d77c75036aa2f2cf296a6
-HOTSPOT_SHA256SUM = 4ec39fddd8d5ff9e7e9e2dfeb4fff37c26e84c1aaa9a3f3953e4bedb00bc6713
-JAXP_SHA256SUM = a1a5c6b2671f83d4675f9ba25013c6a16a4cf4d1040fcd2ff4143c92bd5496a3
-JAXWS_SHA256SUM = 8fe84a61142d579487bee98133fc26e57aedb97f781dc925ad3803aa40f5c061
-JDK_SHA256SUM = 650922377d1e847c26e1ea7475a46ae6f8bac3ba7747a2c1467c7136d1b7b4d6
-LANGTOOLS_SHA256SUM = 1df1bb1edd5f912405398c0024f8290f6a9030172dd1196c52e2c461769a1a07
-OPENJDK_SHA256SUM = 937930cb6c3174f8bdbf3d0034832fbde539fd62591087f1d6fcec695ed20519
+CORBA_SHA256SUM = 82eebaa8a248e18a4e4a0552716453c1f7877135ea73b51f3056fdec850267f9
+HOTSPOT_SHA256SUM = 3868c969833dc3b88523d711fc21cfc2c57fea5b6f387a7082aff5634b35c0a1
+JAXP_SHA256SUM = 91b65e352002079045dc1dee1c2a1af92db74a589b11b0a01777760adca80c64
+JAXWS_SHA256SUM = 01747b77f40ffe554a3ee0ff8b902db0d743a1f8f6260c9141a1fb3d1c6cc230
+JDK_SHA256SUM = f08020de62bef31ff0a42564d06c84817150f943729132045e8af602c608467b
+LANGTOOLS_SHA256SUM = e7384d93ac86c5b91b767bbbcb58a7037089446943935292d0d7706d16becc9f
+OPENJDK_SHA256SUM = 7143dc00cad9b7f8a653e8e22aec9fd3fa354325eaf79007326b16b887b6fbe6
CACAO_VERSION = e321b101a9ee
CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
@@ -31,8 +31,8 @@
JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip
JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp-1_4_5-dev.zip
-JAXP_DROP_SHA256SUM = 938cce9d3f0afaa5d076c62a2de081862102d10bfe04a0767122f2dff5bd975e
+JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip
+JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5
ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
@@ -236,7 +236,6 @@
ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
patches/icedtea-rmi_amd64.patch \
- patches/icedtea-tools.patch \
patches/icedtea-demos.patch \
patches/icedtea-headers.patch \
patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
@@ -271,7 +270,6 @@
patches/security/icedtea-6592792.patch \
patches/security/icedtea-6733959.patch \
patches/security/icedtea-6755943.patch \
- patches/icedtea-demo-swingapplet.patch \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-disable-intree-ec.patch \
patches/icedtea-sources.patch \
@@ -347,7 +345,6 @@
patches/boot/test_gamma.patch \
patches/boot/tools.jar.patch \
patches/boot/icedtea-jopt.patch \
- patches/boot/icedtea-dyn.patch \
patches/boot/icedtea-jaxp-dependency.patch \
patches/boot/genstubs-nofork.patch \
patches/boot/getannotation-cast.patch \
@@ -361,7 +358,8 @@
patches/boot/jaxws-jdk-dependency.patch \
patches/boot/hotspot-jdk-dependency.patch \
patches/boot/ecj-multicatch.patch \
- patches/boot/ecj-trywithresources.patch
+ patches/boot/ecj-trywithresources.patch \
+ patches/boot/ecj-autoboxing.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
diff -r 0f9261320112 -r e53fc64228c1 patches/boot/ecj-autoboxing.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/ecj-autoboxing.patch Sun May 01 18:12:29 2011 +0100
@@ -0,0 +1,263 @@
+diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/CallSite.java
+--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Wed Apr 20 04:38:36 2011 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Sat Apr 30 02:38:41 2011 +0100
+@@ -309,7 +309,7 @@
+
+ private static Object maybeReBox(Object x) {
+ if (x instanceof Integer) {
+- int xi = (int) x;
++ int xi = (Integer) x;
+ if (xi == (byte) xi)
+ x = xi; // must rebox; see JLS 5.1.7
+ }
+diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/FromGeneric.java
+--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Wed Apr 20 04:38:36 2011 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Sat Apr 30 02:38:41 2011 +0100
+@@ -502,10 +502,10 @@
+ protected A0 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A0(e, i, c, t); }
+ protected Object invoke_L0() throws Throwable { return convert_L((Object)invoker.invokeExact(target)); }
+- protected Object invoke_I0() throws Throwable { return convert_I((int) invoker.invokeExact(target)); }
+- protected Object invoke_J0() throws Throwable { return convert_J((long) invoker.invokeExact(target)); }
+- protected Object invoke_F0() throws Throwable { return convert_F((float) invoker.invokeExact(target)); }
+- protected Object invoke_D0() throws Throwable { return convert_D((double)invoker.invokeExact(target)); }
++ protected Object invoke_I0() throws Throwable { return convert_I((Integer) invoker.invokeExact(target)); }
++ protected Object invoke_J0() throws Throwable { return convert_J((Long) invoker.invokeExact(target)); }
++ protected Object invoke_F0() throws Throwable { return convert_F((Float) invoker.invokeExact(target)); }
++ protected Object invoke_D0() throws Throwable { return convert_D((Double)invoker.invokeExact(target)); }
+ }
+ static class A1 extends Adapter {
+ protected A1(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -514,10 +514,10 @@
+ protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A1(e, i, c, t); }
+ protected Object invoke_L1(Object a0) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0)); }
+- protected Object invoke_I1(Object a0) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0)); }
+- protected Object invoke_J1(Object a0) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0)); }
+- protected Object invoke_F1(Object a0) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0)); }
+- protected Object invoke_D1(Object a0) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0)); }
++ protected Object invoke_I1(Object a0) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0)); }
++ protected Object invoke_J1(Object a0) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0)); }
++ protected Object invoke_F1(Object a0) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0)); }
++ protected Object invoke_D1(Object a0) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0)); }
+ }
+ static class A2 extends Adapter {
+ protected A2(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -526,10 +526,10 @@
+ protected A2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A2(e, i, c, t); }
+ protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1)); }
+- protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1)); }
+- protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1)); }
+- protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1)); }
+- protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1)); }
++ protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1)); }
++ protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1)); }
++ protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1)); }
++ protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1)); }
+ }
+ static class A3 extends Adapter {
+ protected A3(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -538,10 +538,10 @@
+ protected A3 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A3(e, i, c, t); }
+ protected Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2)); }
+- protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2)); }
+- protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2)); }
+- protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2)); }
+- protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2)); }
++ protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2)); }
++ protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2)); }
++ protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2)); }
++ protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2)); }
+ }
+ static class A4 extends Adapter {
+ protected A4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -550,10 +550,10 @@
+ protected A4 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A4(e, i, c, t); }
+ protected Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3)); }
+- protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3)); }
+- protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3)); }
+- protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3)); }
+- protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3)); }
++ protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3)); }
++ protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3)); }
++ protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3)); }
++ protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3)); }
+ }
+ static class A5 extends Adapter {
+ protected A5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -562,10 +562,10 @@
+ protected A5 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A5(e, i, c, t); }
+ protected Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
+- protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
+- protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
+- protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
+- protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
++ protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
++ protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
++ protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
++ protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
+ }
+ static class A6 extends Adapter {
+ protected A6(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -574,10 +574,10 @@
+ protected A6 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A6(e, i, c, t); }
+ protected Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
+- protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
+- protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
+- protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
+- protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
++ protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
++ protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
++ protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
++ protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
+ }
+ static class A7 extends Adapter {
+ protected A7(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -586,10 +586,10 @@
+ protected A7 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A7(e, i, c, t); }
+ protected Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
+- protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
+- protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
+- protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
+- protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
++ protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
++ protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
++ protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
++ protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
+ }
+ static class A8 extends Adapter {
+ protected A8(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -598,10 +598,10 @@
+ protected A8 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A8(e, i, c, t); }
+ protected Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
+- protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
+- protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
+- protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
+- protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
++ protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
++ protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
++ protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
++ protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
+ }
+ static class A9 extends Adapter {
+ protected A9(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -610,10 +610,10 @@
+ protected A9 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A9(e, i, c, t); }
+ protected Object invoke_L9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
+- protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
+- protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
+- protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
+- protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
++ protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
++ protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
++ protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
++ protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
+ }
+ static class A10 extends Adapter {
+ protected A10(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
+@@ -622,9 +622,9 @@
+ protected A10 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
+ { return new A10(e, i, c, t); }
+ protected Object invoke_L10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
+- protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
+- protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
+- protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
+- protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
++ protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
++ protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
++ protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
++ protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
+ }
+ }
+diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/MethodHandleImpl.java
+--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed Apr 20 04:38:36 2011 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Sat Apr 30 02:38:41 2011 +0100
+@@ -832,52 +832,52 @@
+ return addTypeString(target, this);
+ }
+ private Object invoke_V(Object... av) throws Throwable {
+- if ((boolean) test.invokeExact(av))
++ if ((Boolean) test.invokeExact(av))
+ return target.invokeExact(av);
+ return fallback.invokeExact(av);
+ }
+ private Object invoke_L0() throws Throwable {
+- if ((boolean) test.invokeExact())
++ if ((Boolean) test.invokeExact())
+ return target.invokeExact();
+ return fallback.invokeExact();
+ }
+ private Object invoke_L1(Object a0) throws Throwable {
+- if ((boolean) test.invokeExact(a0))
++ if ((Boolean) test.invokeExact(a0))
+ return target.invokeExact(a0);
+ return fallback.invokeExact(a0);
+ }
+ private Object invoke_L2(Object a0, Object a1) throws Throwable {
+- if ((boolean) test.invokeExact(a0, a1))
++ if ((Boolean) test.invokeExact(a0, a1))
+ return target.invokeExact(a0, a1);
+ return fallback.invokeExact(a0, a1);
+ }
+ private Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable {
+- if ((boolean) test.invokeExact(a0, a1, a2))
++ if ((Boolean) test.invokeExact(a0, a1, a2))
+ return target.invokeExact(a0, a1, a2);
+ return fallback.invokeExact(a0, a1, a2);
+ }
+ private Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable {
+- if ((boolean) test.invokeExact(a0, a1, a2, a3))
++ if ((Boolean) test.invokeExact(a0, a1, a2, a3))
+ return target.invokeExact(a0, a1, a2, a3);
+ return fallback.invokeExact(a0, a1, a2, a3);
+ }
+ private Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable {
+- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4))
++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4))
+ return target.invokeExact(a0, a1, a2, a3, a4);
+ return fallback.invokeExact(a0, a1, a2, a3, a4);
+ }
+ private Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable {
+- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5))
++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5))
+ return target.invokeExact(a0, a1, a2, a3, a4, a5);
+ return fallback.invokeExact(a0, a1, a2, a3, a4, a5);
+ }
+ private Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable {
+- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6))
++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6))
+ return target.invokeExact(a0, a1, a2, a3, a4, a5, a6);
+ return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6);
+ }
+ private Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable {
+- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7))
++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7))
+ return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);
+ return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);
+ }
+diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/ToGeneric.java
+--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Wed Apr 20 04:38:36 2011 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Sat Apr 30 02:38:41 2011 +0100
+@@ -390,10 +390,10 @@
+
+ // Code to run when the generic target has finished and produced a value.
+ protected Object return_L(Object res) throws Throwable { return (Object)convert.invokeExact(res); }
+- protected int return_I(Object res) throws Throwable { return (int) convert.invokeExact(res); }
+- protected long return_J(Object res) throws Throwable { return (long) convert.invokeExact(res); }
+- protected float return_F(Object res) throws Throwable { return (float) convert.invokeExact(res); }
+- protected double return_D(Object res) throws Throwable { return (double)convert.invokeExact(res); }
++ protected int return_I(Object res) throws Throwable { return (Integer) convert.invokeExact(res); }
++ protected long return_J(Object res) throws Throwable { return (Long) convert.invokeExact(res); }
++ protected float return_F(Object res) throws Throwable { return (Float) convert.invokeExact(res); }
++ protected double return_D(Object res) throws Throwable { return (Double)convert.invokeExact(res); }
+
+ static private final String CLASS_PREFIX; // "java.lang.invoke.ToGeneric$"
+ static {
diff -r 0f9261320112 -r e53fc64228c1 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Thu Apr 21 20:12:07 2011 -0400
+++ b/patches/boot/ecj-diamond.patch Sun May 01 18:12:29 2011 +0100
@@ -1,6 +1,6 @@
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 2011-04-11 12:34:30.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-13 15:10:03.590190441 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-14 01:29:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-28 17:28:50.894745825 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -72,8 +72,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 2011-04-12 00:18:33.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-13 15:10:03.606190699 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-28 17:10:59.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-28 17:28:50.902745957 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -83,7 +83,7 @@
for (int i = 0; i < basicCodings.length; i++) {
Coding c = basicCodings[i];
if (c == null) continue;
-@@ -1050,8 +1050,8 @@
+@@ -1068,8 +1068,8 @@
// Bootstrap support for CPRefBands. These are needed to record
// intended CP indexes, before the CP has been created.
@@ -94,7 +94,7 @@
int encodeRef(Entry e, Index ix) {
-@@ -1686,7 +1686,7 @@
+@@ -1704,7 +1704,7 @@
protected int attrClassFileVersionMask;
// Mapping from Attribute.Layout to Band[] (layout element bands).
@@ -103,7 +103,7 @@
// Well-known attributes:
protected final Attribute.Layout attrCodeEmpty;
-@@ -1695,11 +1695,11 @@
+@@ -1713,11 +1713,11 @@
protected final Attribute.Layout attrConstantValue;
// Mapping from Attribute.Layout to Integer (inverse of attrDefs)
@@ -117,7 +117,7 @@
{
for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) {
assert(attrIndexLimit[i] == 0);
-@@ -1894,7 +1894,7 @@
+@@ -1912,7 +1912,7 @@
protected List getPredefinedAttrs(int ctype) {
assert(attrIndexLimit[ctype] != 0);
@@ -126,7 +126,7 @@
// Remove nulls and non-predefs.
for (int ai = 0; ai < attrIndexLimit[ctype]; ai++) {
if (testBit(attrDefSeen[ctype], 1L<<ai)) continue;
-@@ -2518,7 +2518,7 @@
+@@ -2536,7 +2536,7 @@
// DEBUG ONLY: Record something about the band order.
boolean notePrevForAssert(Band b, Band p) {
if (prevForAssertMap == null)
@@ -136,9 +136,9 @@
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 2011-04-12 00:18:33.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-04-13 15:10:03.606190699 +0100
-@@ -469,7 +469,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-04-28 17:10:59.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-04-28 17:28:50.902745957 +0100
+@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
int nc = readUnsignedShort();
@@ -148,8 +148,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 2011-04-12 00:18:33.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-13 15:10:03.606190699 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-14 01:29:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-28 17:28:50.902745957 +0100
@@ -743,9 +743,9 @@
More information about the distro-pkg-dev
mailing list