/hg/release/icedtea7-2.5: Update to icedtea-2.5pre04.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Apr 18 05:46:19 UTC 2014
changeset 579668bd82f7 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=579668bd82f7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 18 06:46:03 2014 +0100
Update to icedtea-2.5pre04.
2014-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(BUILD_VERSION): Bump to b15.
(CORBA_CHANGESET): Update to icedtea-2.5pre04 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.
(ICEDTEA_PATCHES): Temporarily disable systemtap_gc
patch which breaks build.
* NEWS: Updated.
* configure.ac: Bump to pre04.
* hotspot.map: Update to icedtea-2.5pre04.
* patches/boot/ecj-autoboxing.patch: Regenerated.
* patches/boot/ecj-diamond.patch: Regenerated and
new cases added for JDK13Services, SubjectDelegator
and ScriptEngineManager.
* patches/boot/ecj-trywithresources.patch: Regenerated.
* patches/rhino.patch: Likewise.
diffstat:
ChangeLog | 28 +
Makefile.am | 30 +-
NEWS | 34 +-
configure.ac | 2 +-
hotspot.map | 2 +-
patches/boot/ecj-autoboxing.patch | 236 +++---
patches/boot/ecj-diamond.patch | 1138 ++++++++++++++++--------------
patches/boot/ecj-trywithresources.patch | 188 ++--
patches/rhino.patch | 52 +-
9 files changed, 906 insertions(+), 804 deletions(-)
diffs (truncated from 4132 to 500 lines):
diff -r d3eb8e1c6de5 -r 579668bd82f7 ChangeLog
--- a/ChangeLog Wed Apr 02 20:10:19 2014 +0100
+++ b/ChangeLog Fri Apr 18 06:46:03 2014 +0100
@@ -1,3 +1,31 @@
+2014-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (BUILD_VERSION): Bump to b15.
+ (CORBA_CHANGESET): Update to icedtea-2.5pre04 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.
+ (ICEDTEA_PATCHES): Temporarily disable systemtap_gc
+ patch which breaks build.
+ * NEWS: Updated.
+ * configure.ac: Bump to pre04.
+ * hotspot.map: Update to icedtea-2.5pre04.
+ * patches/boot/ecj-autoboxing.patch: Regenerated.
+ * patches/boot/ecj-diamond.patch: Regenerated and
+ new cases added for JDK13Services, SubjectDelegator
+ and ScriptEngineManager.
+ * patches/boot/ecj-trywithresources.patch: Regenerated.
+ * patches/rhino.patch: Likewise.
+
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
diff -r d3eb8e1c6de5 -r 579668bd82f7 Makefile.am
--- a/Makefile.am Wed Apr 02 20:10:19 2014 +0100
+++ b/Makefile.am Fri Apr 18 06:46:03 2014 +0100
@@ -1,22 +1,22 @@
# Dependencies
JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b12
+BUILD_VERSION = b15
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 3a7c12d7b1cf
-JAXP_CHANGESET = 1fef0a819b0a
-JAXWS_CHANGESET = c3f7dc317cdb
-JDK_CHANGESET = 06f771c9a7b7
-LANGTOOLS_CHANGESET = f38810d86876
-OPENJDK_CHANGESET = 9e3f6f4585c5
+CORBA_CHANGESET = e120608ed399
+JAXP_CHANGESET = 611fdb7bcd4f
+JAXWS_CHANGESET = 8c3ac91d06c0
+JDK_CHANGESET = 2cef4a93bcb8
+LANGTOOLS_CHANGESET = 2f5810fa2937
+OPENJDK_CHANGESET = c6d37b19485e
-CORBA_SHA256SUM = 5482758eb6ba5953b100dd8754b11905bcfc839741f1987c301fd16f26222a74
-JAXP_SHA256SUM = 1fa313b7d1bddc6d52cfd344a281ed9d5fffd79bdc83499b9761581aacb6dd1e
-JAXWS_SHA256SUM = f6c9d4da5581d08ba5b0cc692d84dea7b90d665d10e0c1eedcfe8c706bc779ef
-JDK_SHA256SUM = d3a87a47e2919e76abe9f616378852546300f6630804cb2ec1defb642d113f31
-LANGTOOLS_SHA256SUM = 7b77d3083347edd22a9227175cce2749844e59bcad737c22b4ede925c25cb34d
-OPENJDK_SHA256SUM = f13b6a59399b388875bf71c8b864bff025d2cf2beb494fa00df60034ca4267bb
+CORBA_SHA256SUM = 16d1f4117a86bbc0ce29fc2ef7797fba9e9a9977b6dae49dcf606592d37a03fc
+JAXP_SHA256SUM = 6781b72fbe79b396262f942b6deaa2151deacf1a20b88d55145aa06cfa14e6e2
+JAXWS_SHA256SUM = a2c63277208f45addc51bbd5e40bf7dc7b0261fa9154cd4df7e0a5bfbf414440
+JDK_SHA256SUM = f3fea92a9caf00a5b3dbceb6fbe16d45ffb43be05371f15325d3246269a502f0
+LANGTOOLS_SHA256SUM = c19e847a613e2126ce91bfe4fdab8484356b1fb98d5754d85ca231145c02d002
+OPENJDK_SHA256SUM = ede5c64b02378d59e7ea96c9bab6c7c43d8095ddb576dc0159f68f658112b46d
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -289,8 +289,8 @@
endif
if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += \
- patches/hotspot/$(HSBUILD)/systemtap_gc.patch
+#ICEDTEA_PATCHES += \
+# patches/hotspot/$(HSBUILD)/systemtap_gc.patch
endif
if ENABLE_NSS
diff -r d3eb8e1c6de5 -r 579668bd82f7 NEWS
--- a/NEWS Wed Apr 02 20:10:19 2014 +0100
+++ b/NEWS Fri Apr 18 06:46:03 2014 +0100
@@ -28,6 +28,7 @@
- S7124320: [TEST_BUG] [macosx] JComboBox doesn't change selection on mouse over
- S7124338: [macosx] Selection lost if a selected item removed from a java.awt.List
- S7129133: [macosx] Accelerators are displayed as Meta instead of the Command symbol
+ - S7131153: GetDC called way too many times - causes bad performance.
- S7133122: SA throws sun.jvm.hotspot.debugger.UnmappedAddressException when it should not
- S7133146: [macosx] closed/javax/swing/JInternalFrame/4193219/IconCoord fails on MacOS
- S7133154: [TEST_BUG] [macosx] closed/javax/swing/JInternalFrame/4251301/bug4251301.java fails on MacOS
@@ -35,8 +36,10 @@
- S7147084: (process) appA hangs when read output stream of appB which starts appC that runs forever
- S7171591: getDefaultScopeID() in src/solaris/native/java/net/net_util_md.c should return a value
- S7173464: Clipboard.getAvailableDataFlavors: Comparison method violates contract
+ - 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
- S7191817: -XX:+UseSerialGC -XX:+UseLargePages crashes with SIGFPE on MacOS X
- S7194607: VerifyLocalVariableTableOnRetransformTest.sh fails after JSR-292 merge
- S7197210: java/lang/invoke/CallSiteTest.java failing on armsflt.
@@ -78,6 +81,7 @@
- S8014240: G1: Add remembered set size information to output of G1PrintRegionLivenessInfo
- S8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
- S8014394: (fs) WatchService failing when watching \\server\$d
+ - S8014460: Need to check for non-empty EXT_LIBS_PATH before using it
- S8014555: G1: Memory ordering problem with Conc refinement and card marking
- S8015092: SchemaFactory cannot parse schema if whitespace added within patterns in Selector XPath expression
- S8015243: SchemaFactory does not catch enum. value that is not in the value space of the base type, anyURI
@@ -85,6 +89,7 @@
- S8015599: [TEST_BUG] [macosx] Test closed/javax/swing/Popup/TaskbarPositionTest.java fails since JDK 8 b75 on MacOSX
- S8015600: [TEST_BUG] [macosx] Test closed/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java fails since JDK 8 b75 on MacOSX
- S8016018: Typo in AbstractStringBuilder#indexOf and #lastIndexOf descriptions
+ - S8016110: Japanese char (MS932) 0x5C cannot be used as an argument when quoted
- S8016271: wsimport -clientjar does not create portable jars on Windows due to hardcoded backslash
- S8016328: Regression : Javadoc i18n regression caused by fix for 8012375
- S8016500: Unlocalized warnings.
@@ -101,7 +106,6 @@
- S8020191: System.getProperty("os.name") returns "Windows NT (unknown)" on Windows 8.1
- S8020530: Non heap memory size calculated incorrectly
- S8020791: [TESTBUG] runtime/jsig/Test8017498.sh failed to compile native code
- - S8021257: com.sun.corba.se.** should be on restricted package list
- S8021296: [TESTBUG] Test8017498.sh fails to find "gcc" and fails to compile on some Linux releases
- S8021368: Launch of Java Web Start app fails with ClassCircularityError exception in 7u25
- S8021898: Broken JIT compiler optimization for loop unswitching
@@ -111,7 +115,6 @@
- S8022507: SIGSEGV at ParMarkBitMap::verify_clear()
- S8022584: Memory leak in some NetworkInterface methods
- S8022585: VM crashes when ran with -XX:+PrintInlining
- - S8022698: javax/script/GetInterfaceTest.java fails since 7u45 b04 with -agentvm option
- S8022993: Convert MAX_UNROLL constant to LoopMaxUnroll C2 flag
- S8023004: JSR 292: java.lang.RuntimeException: Original target method was called.
- S8023130: (process) ProcessBuilder#inheritIO does not work on Windows
@@ -140,6 +143,7 @@
- S8025305: Cleanup CardTableModRefBS usage in G1
- S8025512: NPE with logging while launching webstart on jre7u40 if logging is disabled
- S8025541: G1: assert "assert(thread < _num_vtimes) failed: just checking" fails when G1ConcRefinementThreads > ParallelGCThreads
+ - S8025588: [macosx] Frozen AppKit thread in 7u40
- S8025713: Syncing indendation/comment/copyright year differences with upstream projects
- S8025775: JNI warnings in TryXShmAttach
- S8025860: new hotspot build - hs24.60-b02
@@ -150,10 +154,12 @@
- S8026405: javax/xml/ws/clientjar/TestWsImport.java failing on JDK 8 nightly aurora test runs
- S8026486: Significant slowdown due to transparent huge pages
- S8026502: java/lang/invoke/MethodHandleConstants.java fails on all platforms
+ - S8026705: [TEST_BUG] java/beans/Introspector/TestTypeResolver.java failed
- S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2)
- S8026848: -XX:+G1SummarizeRSetStats can result in wrong exit code and crash
- S8027066: XMLDecoder in java 7 cannot properly deserialize object arrays
- S8027172: new hotspot build - hs24.60-b03
+ - S8027196: Increment minor version of HSx for 7u55 and initialize the build number
- S8027351: (ref) Private finalize method invoked in preference to protected superclass method
- S8027426: String.toLowerCase incorrectly increases length, if string contains \u0130 char
- S8027454: Do not traverse string table during G1 remark when treating them as strong roots during initial mark
@@ -181,21 +187,40 @@
- S8029903: Add a type safe alternative for working with counter based data
- S8030061: new hotspot build - hs24.60-b05
- S8030070: Test java/io/File/CheckPermission.java fails due to unfinished recursion (java.lang.StackOverflowError) when JIT'ed code (-client,-server) is running
+ - S8030655: Regression: 14_01 Security fix 8024306 causes test failures
- S8030698: Several GUI labels in jconsole need correction
+ - S8030813: Signed applet fails to load when CRLs are stored in an LDAP directory
+ - S8030822: (tz) Support tzdata2013i
+ - S8031050: (thread) Change Thread initialization so that thread name is set before invoking SecurityManager
+ - S8031394: (sl) Fix exception handling in ServiceLoader
+ - S8031462: Fonts with morx tables are broken with latest ICU fixes
- S8031787: Remove fix JDK-8026887 from 7u60
- S8031980: Add new j.u.l deadlock test for JDK-8027670 and JDK-8029281
- S8032013: new hotspot build - hs24.60-b08
- S8032207: C2: assert(VerifyOops || MachNode::size(ra_) <= (3+1)*4) failed: bad fixed size
+ - S8032740: Need to create SE Embedded Source Bundles in 7 Release
- S8032771: The flag VerifySilently misses a test case
- S8032960: Running forms URL throws NullPointerException in Javaconsole.
- S8032986: new hotspot build - hs24.60-b09
- S8033294: javac, spurious warning for instanceof operator
- S8033443: Test8000311 fails after latest changes to parallelize string and symbol table unlink
- S8033487: Improve GC option handling
+ - S8034181: SIGBUS in SctpChannelImpl receive
+ - S8034772: JDK-8028795 brought a specification change to 7u55 release and caused JCK7 signature test failure
+ - S8035283: Second phase of branch shortening doesn't account for loop alignment
+ - S8035618: Four api/org_omg/CORBA TCK tests fail under plugin only
- S8035893: JVM_GetVersionInfo fails to zero structure
- S8035897: Better memory allocation for file descriptors greater than 1024 on macosx
+ - S8035963: The failed Kerberos tests due to timeouts
- S8035988: 7u60 l10n resource file translation update 1
+ - 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
+ - S8036837: Increment hsx 24.55 build to b03 for 7u55-b12
+ - S8037012: (tz) Support tzdata2014a
+ - S8037340: Linux semaphores to use CLOCK_REALTIME
+ - S8037510: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
+ - S8039097: Some tests fail with NPE since 7u60 b12
* Backports
- S7103549: Remove dependencies on libjava and libjvm from security libraries
- S8000204: Memory leak in com/sun/security/auth/module/Unix.c
@@ -229,8 +254,9 @@
- Add new files from 8019229
- Remove duplicate ElfFuncDescTable code in elfSymbolTable.cpp
- Remove duplicate ElfFuncDescTable code in elfSymbolTable.hpp
- - PR1726: configure fails looking for ecj.jar before even trying to find javac
- PR1699: Support building the SunEC provider with system NSS
+ - PR1393: JPEG support in build is broken on non-system-libjpeg builds
+ - Fix merge duplication in com.sun.script.javascript.RhinoTopLevel
* PPC & AIX port
- Add AIX-specific build instructions to README-ppc.html
- Added AIX as testing platform for more jtreg tests written in shell-script
@@ -449,6 +475,8 @@
- Use macosx's BsdVirtualMachine implementation to provide tools/attach on AIX platform.
- Use stubs to implement safefetch.
- Use the solaris' approach of doing IsXRenderAvailable check for AIX
+* ARM port
+ - Fix accidental reversion of PR1188 for armel
* JamVM
- JVM_NewMultiArray: element class may be an array
- jtreg test java/lang/reflect/Array/ExceedMaxDim
diff -r d3eb8e1c6de5 -r 579668bd82f7 configure.ac
--- a/configure.ac Wed Apr 02 20:10:19 2014 +0100
+++ b/configure.ac Fri Apr 18 06:46:03 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5pre03], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5pre04], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r d3eb8e1c6de5 -r 579668bd82f7 hotspot.map
--- a/hotspot.map Wed Apr 02 20:10:19 2014 +0100
+++ b/hotspot.map Fri Apr 18 06:46:03 2014 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot 903304e152fc 74c1ba2ddd7130bf8a5d85fad48886ece9b81ac41dee8d4be5f51a459db8e9c9
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot 6dfe2b3e243c 8f3c77d483989dbf06771df0c0575ce38700018865234c96bc8a8237548c18c0
aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
diff -r d3eb8e1c6de5 -r 579668bd82f7 patches/boot/ecj-autoboxing.patch
--- a/patches/boot/ecj-autoboxing.patch Wed Apr 02 20:10:19 2014 +0100
+++ b/patches/boot/ecj-autoboxing.patch Fri Apr 18 06:46:03 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-04-18 05:16:59.309775872 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-04-18 05:19:44.804221566 +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-04-17 22:51:43.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java 2014-04-18 05:18:50.303416137 +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-04-17 22:51:43.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-04-18 05:18:50.303416137 +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-04-18 05:16:59.309775872 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-04-18 05:18:50.303416137 +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-04-18 05:16:59.345776405 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-04-18 05:18:50.303416137 +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-04-18 05:16:59.313775930 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-04-18 05:18:50.303416137 +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 d3eb8e1c6de5 -r 579668bd82f7 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Apr 02 20:10:19 2014 +0100
+++ b/patches/boot/ecj-diamond.patch Fri Apr 18 06:46:03 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-02 02:15:58.000000000 +0100
More information about the distro-pkg-dev
mailing list