/hg/icedtea7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 9 15:38:06 UTC 2014
changeset eb66000601af in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=eb66000601af
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 01 22:57:05 2014 +0100
PR1758: Support PPC64 JIT on ppc64le
2014-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
* AUTHORS: Add Tiago.
* NEWS: Updated.
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Expand ppc64le to its
own block to avoid potential future collisions.
(IT_ENABLE_ZERO_BUILD): Likewise.
2014-05-01 Tiago Sturmer Daitx <tdaitx at linux.vnet.ibm.com>
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Support ppc64le.
(IT_ENABLE_ZERO_BUILD): Likewise and use correct
host_cpu value for ppc64.
changeset 4f67c07197c3 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=4f67c07197c3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 09 16:36:34 2014 +0100
Bump to icedtea-2.6pre04.
2014-05-09 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(BUILD_VERSION): Bump to b15.
(CORBA_CHANGESET): Update to icedtea-2.6pre04 tag.
(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.
* NEWS: Updated.
* configure.ac: Bump to pre03.
* hotspot.map: Bump default to icedtea-2.6pre04 tag.
* patches/boot/ecj-autoboxing.patch: Regenerated.
* patches/boot/ecj-diamond.patch: Regenerated and
cases in ScriptManager, JDK13Services and ServiceDelegator
added.
* patches/boot/ecj-trywithresources.patch: Regenerated.
diffstat:
AUTHORS | 1 +
ChangeLog | 41 +
Makefile.am | 26 +-
NEWS | 19 +
acinclude.m4 | 9 +-
configure.ac | 2 +-
hotspot.map | 2 +-
patches/boot/ecj-autoboxing.patch | 236 +++---
patches/boot/ecj-diamond.patch | 1138 ++++++++++++++++--------------
patches/boot/ecj-trywithresources.patch | 196 ++--
10 files changed, 897 insertions(+), 773 deletions(-)
diffs (truncated from 3990 to 500 lines):
diff -r 53f3eede6777 -r 4f67c07197c3 AUTHORS
--- a/AUTHORS Thu May 01 20:17:50 2014 +0100
+++ b/AUTHORS Fri May 09 16:36:34 2014 +0100
@@ -8,6 +8,7 @@
Deepak Bhole <dbhole at redhat.com>
Tom Callaway <tcallawa at redhat.com>
Pablo del Campo <pablogdc at gmail.com>
+Tiago Sturmer Daitx <tdaitx at linux.vnet.ibm.com>
Thomas Fitzsimmons <fitzsim at redhat.com>
Matthew Flaschen <matthew.flaschen at gatech.edu>
Michael Franz <mvfranz at gmail.com>
diff -r 53f3eede6777 -r 4f67c07197c3 ChangeLog
--- a/ChangeLog Thu May 01 20:17:50 2014 +0100
+++ b/ChangeLog Fri May 09 16:36:34 2014 +0100
@@ -1,3 +1,44 @@
+2014-05-09 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (BUILD_VERSION): Bump to b15.
+ (CORBA_CHANGESET): Update to icedtea-2.6pre04 tag.
+ (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.
+ * NEWS: Updated.
+ * configure.ac: Bump to pre03.
+ * hotspot.map: Bump default to icedtea-2.6pre04 tag.
+ * patches/boot/ecj-autoboxing.patch: Regenerated.
+ * patches/boot/ecj-diamond.patch: Regenerated and
+ cases in ScriptManager, JDK13Services and ServiceDelegator
+ added.
+ * patches/boot/ecj-trywithresources.patch: Regenerated.
+
+2014-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * AUTHORS: Add Tiago.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Expand ppc64le to its
+ own block to avoid potential future collisions.
+ (IT_ENABLE_ZERO_BUILD): Likewise.
+
+2014-05-01 Tiago Sturmer Daitx <tdaitx at linux.vnet.ibm.com>
+
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Support ppc64le.
+ (IT_ENABLE_ZERO_BUILD): Likewise and use correct
+ host_cpu value for ppc64.
+
2014-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1756: Bootstrap with IcedTea broken
diff -r 53f3eede6777 -r 4f67c07197c3 Makefile.am
--- a/Makefile.am Thu May 01 20:17:50 2014 +0100
+++ b/Makefile.am Fri May 09 16:36:34 2014 +0100
@@ -1,22 +1,22 @@
# Dependencies
JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b13
+BUILD_VERSION = b15
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 35fa09c49527
-JAXP_CHANGESET = 33912ce9492d
-JAXWS_CHANGESET = ef698865ff56
-JDK_CHANGESET = 068d2b78bd73
-LANGTOOLS_CHANGESET = 2950924c2b80
-OPENJDK_CHANGESET = edf01342f3cb
+CORBA_CHANGESET = d99431d571f8
+JAXP_CHANGESET = c3178eab3782
+JAXWS_CHANGESET = 95bbd42cadc9
+JDK_CHANGESET = b69f22ae0ef3
+LANGTOOLS_CHANGESET = fa084876cf02
+OPENJDK_CHANGESET = 9f06098d4daa
-CORBA_SHA256SUM = 2aa4e5c18084eaaacecc3c5e0104286cb15053145b5c71be91f7a2c2e6d2f828
-JAXP_SHA256SUM = 0c93de8873e4609ae0e191541c3e8331addb657a491ed1ba36d9268bb2fe23f2
-JAXWS_SHA256SUM = 28991aa42190e391d45d4c79e8fca955249c3cf4b95a1783b8a36179b998c13a
-JDK_SHA256SUM = aeeb18019359df6cd23ef479cfddea2ed9940572c265a65c70d15403cdc78151
-LANGTOOLS_SHA256SUM = 5f0179d4d9f55276ceff7f151d203b96698cde1b250430c4963f2a3a8525fd7e
-OPENJDK_SHA256SUM = 5585a7ffce369a3f6dbbcadb86852a5a28ce0b2b0734fd734cedec611156ecc8
+CORBA_SHA256SUM = 0effb80b84fa2b601e3d9dd606d74eb46602d9434598fe251476025403947daf
+JAXP_SHA256SUM = c74e2a3f3870669caf3d4cc96dbd66b229537a4a3262a568a8804b77306f64dd
+JAXWS_SHA256SUM = 58031cca78172b608a6174ae9ad2e9f8fddd8b212e206185368e7860e067da44
+JDK_SHA256SUM = 2767c7195901c3df16c1558a7a7d9a42ffee57ba579b062aede8c3573b18de1b
+LANGTOOLS_SHA256SUM = 8dba11b21e934c59fbe0814e4d1359c1db891484128b3465875a5ba23c350849
+OPENJDK_SHA256SUM = 6eddef0455ed71ec38269e61352f9330dd3de5189617e6f335da84af823fafa4
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
diff -r 53f3eede6777 -r 4f67c07197c3 NEWS
--- a/NEWS Thu May 01 20:17:50 2014 +0100
+++ b/NEWS Fri May 09 16:36:34 2014 +0100
@@ -22,6 +22,7 @@
- S7076487: (sctp) SCTP API classes does not exist in JDK for Mac
- S7084032: test/java/net/Inet6Address/B6558853.java fails on Windows XP/2003 if IPv6
- S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations
+ - S7131153: GetDC called way too many times - causes bad performance.
- S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running
- S7152892: some jtreg tests fail with permission denied
- S7161320: TEST_BUG: java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java fails (Invalid key code)
@@ -29,6 +30,7 @@
- S7176574: sun/security/krb5/auto/TcpTimeout.java failed with solaris-i586
- S7186887: Test T6567415.java can fail on a slow machine
- S7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
+ - S7190349: [macosx] Text (Label) is incorrectly drawn with a rotated g2d
- S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx]
- S8002148: [TEST_BUG] The four lines printed are not the bold typeface.
- S8003253: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java hang intermittently [win]
@@ -75,8 +77,11 @@
- S8024648: 7141246 & 8016131 break Zero port
- S8024675: java/net/NetworkInterface/UniqueMacAddressesTest.java fails on Windows
- S8025305: Cleanup CardTableModRefBS usage in G1
+ - S8025588: [macosx] Frozen AppKit thread in 7u40
- S8025796: hgforest.sh could trigger unbuffered output from hg without complicated machinations
+ - S8026705: [TEST_BUG] java/beans/Introspector/TestTypeResolver.java failed
- S8027026: Change keytool -genkeypair to use -keyalg RSA
+ - S8027196: Increment minor version of HSx for 7u55 and initialize the build number
- S8027212: java/nio/channels/Selector/SelectAfterRead.java fails intermittently
- S8027348: (process) Enhancement of handling async close of ProcessInputStream
- S8027359: XML parser returns incorrect parsing results
@@ -87,11 +92,16 @@
- S8028623: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters.
- S8029073: (corba) New connection reclaimed when number of connection is greater than highwatermark
- S8029281: Synchronization issues in Logger and LogManager
+ - S8030655: Regression: 14_01 Security fix 8024306 causes test failures
- S8030698: Several GUI labels in jconsole need correction
- S8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning
+ - S8030813: Signed applet fails to load when CRLs are stored in an LDAP directory
- S8030822: (tz) Support tzdata2013i
- S8030878: JConsole issues meaningless message if SSL connection fails
+ - S8031050: (thread) Change Thread initialization so that thread name is set before invoking SecurityManager
- S8031061: new hotspot build - hs24.60-b07
+ - S8031462: Fonts with morx tables are broken with latest ICU fixes
+ - S8031477: [macosx] Loading AWT native library fails
- S8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
- S8031743: C2: loadI2L_immI broken for negative memory values
- S8031764: tmtools/jmap/heap_config tests fail on Linux-ia32 because it Cant attach to the core file
@@ -114,6 +124,7 @@
- S8033970: new hotspot build - hs24.80-b02
- S8034181: SIGBUS in SctpChannelImpl receive
- S8034262: Test java/lang/ProcessBuilder/CloseRace.java fails
+ - S8034772: JDK-8028795 brought a specification change to 7u55 release and caused JCK7 signature test failure
- S8034920: new hotspot build - hs24.80-b03
- S8035283: Second phase of branch shortening doesn't account for loop alignment
- S8035435: new hotspot build - hs24.80-b04
@@ -123,15 +134,20 @@
- S8035973: NPE in ForwardBuilder
- S8035988: 7u60 l10n resource file translation update 1
- S8036022: D3D: rendering with XOR composite causes InternalError.
+ - S8036027: Increment hsx 24.51 build to b04 for 7u51-b34
+ - S8036147: Increment hsx 24.55 build to b02 for 7u55-b11
- S8036584: Review comments from 8035897
- S8036778: new hotspot build - hs24.80-b05
- S8036786: Update jdk7 testlibrary to match jdk8
+ - S8036837: Increment hsx 24.55 build to b03 for 7u55-b12
- S8036863: Update jdk7 testlibrary to match jdk8 in hotspot
- S8037012: (tz) Support tzdata2014a
- S8037340: Linux semaphores to use CLOCK_REALTIME
+ - S8037510: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
- S8038481: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
- S8038640: new hotspot build - hs24.80-b06
- S8038785: hot workaround fix for a crash in C2 compiler at Node::rematerialize
+ - S8039097: Some tests fail with NPE since 7u60 b12
* PPC & AIX port
- Fix handling of scalar replaced objects.
- New files for template interpreter
@@ -162,6 +178,9 @@
- Extend S8041658 to all files in the HotSpot build.
- PR1753: Ant does not respect JAVA_HOME/jdk.home setting
- PR1756: Bootstrap with IcedTea broken
+ - PR1758: Support PPC64 JIT on ppc64le
+ - PR1757: register_method usage in sharkCompiler.cpp needs to be adjusted following S7196199
+ - Correct placement of S8041658 fix
New in release 2.5.0 (2014-XX-XX):
diff -r 53f3eede6777 -r 4f67c07197c3 acinclude.m4
--- a/acinclude.m4 Thu May 01 20:17:50 2014 +0100
+++ b/acinclude.m4 Fri May 09 16:36:34 2014 +0100
@@ -54,6 +54,12 @@
JRE_ARCH_DIR=ppc64
ARCHFLAG="-m64"
;;
+ powerpc64le)
+ BUILD_ARCH_DIR=ppc64
+ INSTALL_ARCH_DIR=ppc64
+ JRE_ARCH_DIR=ppc64
+ ARCHFLAG="-m64"
+ ;;
sparc)
BUILD_ARCH_DIR=sparc
INSTALL_ARCH_DIR=sparc
@@ -703,7 +709,8 @@
i?86) ;;
sparc) ;;
x86_64) ;;
- ppc64) ;;
+ powerpc64) ;;
+ powerpc64le) ;;
*)
if test "x${ENABLE_CACAO}" != xno || \
test "x${ENABLE_JAMVM}" = xyes; then
diff -r 53f3eede6777 -r 4f67c07197c3 configure.ac
--- a/configure.ac Thu May 01 20:17:50 2014 +0100
+++ b/configure.ac Fri May 09 16:36:34 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6pre03], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6pre04], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 53f3eede6777 -r 4f67c07197c3 hotspot.map
--- a/hotspot.map Thu May 01 20:17:50 2014 +0100
+++ b/hotspot.map Fri May 09 16:36:34 2014 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 4ab69c6e4c85 03dad0749d7d81e3d5f9d76f9f8aa4d412d9d7ae3f6261efaefad0133ccc3428
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2fd819c8b506 c654bd1163e98da2a6718368a82371f1b220740c4f8b59c150f7c0da4af8842a
aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
diff -r 53f3eede6777 -r 4f67c07197c3 patches/boot/ecj-autoboxing.patch
--- a/patches/boot/ecj-autoboxing.patch Thu May 01 20:17:50 2014 +0100
+++ b/patches/boot/ecj-autoboxing.patch Fri May 09 16:36:34 2014 +0100
@@ -1,6 +1,52 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-05-07 08:51:32.125735531 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-05-07 09:00:03.601219315 +0100
+@@ -71,11 +71,11 @@
+ case 'I':
+ return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('I').constructor[0].invokeBasic(type, form, ValueConversions.widenSubword(x));
+ case 'J':
+- return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('J').constructor[0].invokeBasic(type, form, (long) x);
++ return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('J').constructor[0].invokeBasic(type, form, (Long) x);
+ case 'F':
+- return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('F').constructor[0].invokeBasic(type, form, (float) x);
++ return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('F').constructor[0].invokeBasic(type, form, (Float) x);
+ case 'D':
+- return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('D').constructor[0].invokeBasic(type, form, (double) x);
++ return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('D').constructor[0].invokeBasic(type, form, (Double) x);
+ default : throw new InternalError("unexpected xtype: " + xtype);
+ }
+ } catch (Throwable t) {
+@@ -92,9 +92,9 @@
+ switch (xtype) {
+ case 'L': return cloneExtendL(type, form, x);
+ case 'I': return cloneExtendI(type, form, ValueConversions.widenSubword(x));
+- case 'J': return cloneExtendJ(type, form, (long) x);
+- case 'F': return cloneExtendF(type, form, (float) x);
+- case 'D': return cloneExtendD(type, form, (double) x);
++ case 'J': return cloneExtendJ(type, form, (Long) x);
++ case 'F': return cloneExtendF(type, form, (Float) x);
++ case 'D': return cloneExtendD(type, form, (Double) x);
+ }
+ } catch (Throwable t) {
+ throw newInternalError(t);
+@@ -171,10 +171,10 @@
+ throw new InternalError("unexpected type: " + speciesData().types+"."+i);
+ }
+ /*non-public*/ final Object argL(int i) throws Throwable { return speciesData().getters[i].invokeBasic(this); }
+- /*non-public*/ final int argI(int i) throws Throwable { return (int) speciesData().getters[i].invokeBasic(this); }
+- /*non-public*/ final float argF(int i) throws Throwable { return (float) speciesData().getters[i].invokeBasic(this); }
+- /*non-public*/ final double argD(int i) throws Throwable { return (double) speciesData().getters[i].invokeBasic(this); }
+- /*non-public*/ final long argJ(int i) throws Throwable { return (long) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final int argI(int i) throws Throwable { return (Integer) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final float argF(int i) throws Throwable { return (Float) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final double argD(int i) throws Throwable { return (Double) speciesData().getters[i].invokeBasic(this); }
++ /*non-public*/ final long argJ(int i) throws Throwable { return (Long) speciesData().getters[i].invokeBasic(this); }
+
+ //
+ // cloning API
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/CallSite.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/CallSite.java 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java 2012-11-30 15:01:56.540165063 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/CallSite.java 2014-05-02 20:39:34.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java 2014-05-07 08:59:22.660620050 +0100
@@ -303,7 +303,7 @@
private static Object maybeReBox(Object x) {
@@ -10,9 +56,77 @@
if (xi == (byte) xi)
x = xi; // must rebox; see JLS 5.1.7
}
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-05-02 20:39:34.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-05-07 08:59:22.664620110 +0100
+@@ -315,11 +315,11 @@
+ return;
+ }
+ if (con instanceof Integer) {
+- emitIconstInsn((int) con);
++ emitIconstInsn((Integer) con);
+ return;
+ }
+ if (con instanceof Long) {
+- long x = (long) con;
++ long x = (Long) con;
+ if (x == (short) x) {
+ emitIconstInsn((int) x);
+ mv.visitInsn(Opcodes.I2L);
+@@ -327,7 +327,7 @@
+ }
+ }
+ if (con instanceof Float) {
+- float x = (float) con;
++ float x = (Float) con;
+ if (x == (short) x) {
+ emitIconstInsn((int) x);
+ mv.visitInsn(Opcodes.I2F);
+@@ -335,7 +335,7 @@
+ }
+ }
+ if (con instanceof Double) {
+- double x = (double) con;
++ double x = (Double) con;
+ if (x == (short) x) {
+ emitIconstInsn((int) x);
+ mv.visitInsn(Opcodes.I2D);
+@@ -343,7 +343,7 @@
+ }
+ }
+ if (con instanceof Boolean) {
+- emitIconstInsn((boolean) con ? 1 : 0);
++ emitIconstInsn((Boolean) con ? 1 : 0);
+ return;
+ }
+ // fall through:
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-05-07 08:51:32.125735531 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-05-07 08:59:22.664620110 +0100
+@@ -1444,7 +1444,7 @@
+ if (a1 instanceof Integer && a2 instanceof Integer) {
+ if (sawInt) continue;
+ sawInt = true;
+- if ((int)a1 < (int)a2) continue; // still might be true
++ if (((Integer)a1).intValue() < ((Integer)a2).intValue()) continue; // still might be true
+ }
+ return false;
+ }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-05-07 08:51:32.961747758 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-05-07 08:59:22.664620110 +0100
+@@ -885,7 +885,7 @@
+ MH_checkCallerClass = IMPL_LOOKUP
+ .findStatic(THIS_CLASS, "checkCallerClass",
+ MethodType.methodType(boolean.class, Class.class, Class.class));
+- assert((boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
++ assert((Boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
+ } catch (Throwable ex) {
+ throw newInternalError(ex);
+ }
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-11-30 14:59:33.053919817 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2012-11-30 15:02:05.216300867 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-05-07 08:51:32.133735648 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-05-07 08:59:22.664620110 +0100
@@ -191,9 +191,9 @@
if (x instanceof Number) {
res = (Number) x;
@@ -92,117 +206,3 @@
}
private static MethodType boxType(Wrapper wrap) {
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2012-11-30 17:27:25.095740183 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2012-11-30 17:29:35.229853381 +0000
-@@ -71,11 +71,11 @@
- case 'I':
- return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('I').constructor[0].invokeBasic(type, form, ValueConversions.widenSubword(x));
- case 'J':
-- return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('J').constructor[0].invokeBasic(type, form, (long) x);
-+ return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('J').constructor[0].invokeBasic(type, form, (Long) x);
- case 'F':
-- return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('F').constructor[0].invokeBasic(type, form, (float) x);
-+ return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('F').constructor[0].invokeBasic(type, form, (Float) x);
- case 'D':
-- return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('D').constructor[0].invokeBasic(type, form, (double) x);
-+ return (BoundMethodHandle) SpeciesData.EMPTY.extendWithType('D').constructor[0].invokeBasic(type, form, (Double) x);
- default : throw new InternalError("unexpected xtype: " + xtype);
- }
- } catch (Throwable t) {
-@@ -92,9 +92,9 @@
- switch (xtype) {
- case 'L': return cloneExtendL(type, form, x);
- case 'I': return cloneExtendI(type, form, ValueConversions.widenSubword(x));
-- case 'J': return cloneExtendJ(type, form, (long) x);
-- case 'F': return cloneExtendF(type, form, (float) x);
-- case 'D': return cloneExtendD(type, form, (double) x);
-+ case 'J': return cloneExtendJ(type, form, (Long) x);
-+ case 'F': return cloneExtendF(type, form, (Float) x);
-+ case 'D': return cloneExtendD(type, form, (Double) x);
- }
- } catch (Throwable t) {
- throw newInternalError(t);
-@@ -171,10 +171,10 @@
- throw new InternalError("unexpected type: " + speciesData().types+"."+i);
- }
- public final Object argL(int i) throws Throwable { return speciesData().getters[i].invokeBasic(this); }
-- public final int argI(int i) throws Throwable { return (int) speciesData().getters[i].invokeBasic(this); }
-- public final float argF(int i) throws Throwable { return (float) speciesData().getters[i].invokeBasic(this); }
-- public final double argD(int i) throws Throwable { return (double) speciesData().getters[i].invokeBasic(this); }
-- public final long argJ(int i) throws Throwable { return (long) speciesData().getters[i].invokeBasic(this); }
-+ public final int argI(int i) throws Throwable { return (Integer) speciesData().getters[i].invokeBasic(this); }
-+ public final float argF(int i) throws Throwable { return (Float) speciesData().getters[i].invokeBasic(this); }
-+ public final double argD(int i) throws Throwable { return (Double) speciesData().getters[i].invokeBasic(this); }
-+ public final long argJ(int i) throws Throwable { return (Long) speciesData().getters[i].invokeBasic(this); }
-
- //
- // cloning API
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2012-11-30 17:25:45.038114739 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2012-11-30 17:26:34.766922659 +0000
-@@ -317,11 +317,11 @@
- return;
- }
- if (con instanceof Integer) {
-- emitIconstInsn((int) con);
-+ emitIconstInsn((Integer) con);
- return;
- }
- if (con instanceof Long) {
-- long x = (long) con;
-+ long x = (Long) con;
- if (x == (short) x) {
- emitIconstInsn((int) x);
- mv.visitInsn(Opcodes.I2L);
-@@ -329,7 +329,7 @@
- }
- }
- if (con instanceof Float) {
-- float x = (float) con;
-+ float x = (Float) con;
- if (x == (short) x) {
- emitIconstInsn((int) x);
- mv.visitInsn(Opcodes.I2F);
-@@ -337,7 +337,7 @@
- }
- }
- if (con instanceof Double) {
-- double x = (double) con;
-+ double x = (Double) con;
- if (x == (short) x) {
- emitIconstInsn((int) x);
- mv.visitInsn(Opcodes.I2D);
-@@ -345,7 +345,7 @@
- }
- }
- if (con instanceof Boolean) {
-- emitIconstInsn((boolean) con ? 1 : 0);
-+ emitIconstInsn((Boolean) con ? 1 : 0);
- return;
- }
- // fall through:
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2012-11-30 17:23:21.555782849 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2012-11-30 17:24:24.244801829 +0000
-@@ -1440,7 +1440,7 @@
- if (a1 instanceof Integer && a2 instanceof Integer) {
- if (sawInt) continue;
- sawInt = true;
-- if ((int)a1 < (int)a2) continue; // still might be true
-+ if (((Integer)a1).intValue() < ((Integer)a2).intValue()) continue; // still might be true
- }
- return false;
- }
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2012-11-30 17:22:27.146898269 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2012-11-30 17:22:51.067287189 +0000
-@@ -900,7 +900,7 @@
- MH_checkCallerClass = IMPL_LOOKUP
- .findStatic(THIS_CLASS, "checkCallerClass",
- MethodType.methodType(boolean.class, Class.class, Class.class));
-- assert((boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
-+ assert((Boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
- } catch (Throwable ex) {
- throw newInternalError(ex);
- }
diff -r 53f3eede6777 -r 4f67c07197c3 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Thu May 01 20:17:50 2014 +0100
+++ b/patches/boot/ecj-diamond.patch Fri May 09 16:36:34 2014 +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 2014-04-03 00:38:41.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-04-03 15:37:39.220196239 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-05-02 20:39:22.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-05-07 09:16:14.295618203 +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
More information about the distro-pkg-dev
mailing list