Date: Sun, 19 Jul 2015 14:23:55 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392506 - in head/java/openjdk8: . files Message-ID: <201507191423.t6JENtFO097963@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Jul 19 14:23:54 2015 New Revision: 392506 URL: https://svnweb.freebsd.org/changeset/ports/392506 Log: . Update to 8u51. Added: head/java/openjdk8/files/patch-8u51-b16 (contents, props changed) Deleted: head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-vmError_bsd.cpp head/java/openjdk8/files/patch-jdk-src-solaris-bin-java_md_solinux.c head/java/openjdk8/files/patch-jdk_src_share_native_sun_awt_splashscreen_splashscreen__gif.c head/java/openjdk8/files/patch-langtools-test-Makefile head/java/openjdk8/files/patch-static-libjli Modified: head/java/openjdk8/Makefile head/java/openjdk8/files/patch-bsd head/java/openjdk8/files/patch-bsd-test head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk head/java/openjdk8/files/patch-jdk-src-share-classes-sun-print-PSPrinterJob.java Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Sun Jul 19 13:02:38 2015 (r392505) +++ head/java/openjdk8/Makefile Sun Jul 19 14:23:54 2015 (r392506) @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ @@ -94,8 +93,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 45 -JDK_BUILD_NUMBER= 14 +JDK_UPDATE_VERSION= 51 +JDK_BUILD_NUMBER= 16 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 Added: head/java/openjdk8/files/patch-8u51-b16 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-8u51-b16 Sun Jul 19 14:23:54 2015 (r392506) @@ -0,0 +1,9265 @@ +--- ./.hgtags Tue Mar 17 11:22:18 2015 -0700 ++++ ./.hgtags Mon Jun 01 11:40:12 2015 -0700 +@@ -354,6 +354,7 @@ + fde671d8b2537b6be61f67e583164b5b8b33ac5b jdk8u31-b13 + a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31 + 99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32 ++cf4ebf47413902376f66d2cddaf0282d49699ba7 jdk8u31-b33 + 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00 + f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01 + b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02 +@@ -382,6 +383,8 @@ + e26f15704e37f28acebb22378c4785891aaec637 jdk8u40-b25 + 7a552439756eaad0618ae82a94c034edb65f5d7e jdk8u40-b26 + 12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27 ++eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31 ++b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32 + ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00 + 635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01 + 801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02 +@@ -396,3 +399,23 @@ + 6738b8755c80905e3eecedf94e27f03d23f02ba9 jdk8u45-b11 + 54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12 + 6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13 ++15b679d327da9ee99c05d7ddd75512ce335d5994 jdk8u45-b14 ++438cc91b51330a61a790f0a0ac64816b565d25f0 jdk8u45-b15 ++5a4ccc33ab26b635f91ddd424742b0009a37bcc0 jdk8u45-b31 ++4597cb5171773416c4b2e1843db8592a69ff7a99 jdk8u45-b32 ++a1682688c9aec33c172146ce4be8d3969e7d76bb jdk8u51-b00 ++e04f2ee2d03d9927d2012286a9bcbf511eb887ae jdk8u51-b01 ++4dee64570ad013eb5e1cb16304f9eff558c1c5e9 jdk8u51-b02 ++df8e9cbe5a8a7ce9cf2e0a78910302d08e2dbb53 jdk8u51-b03 ++1d29a8f9bd262c4f3556e0250db80d8dc64d95d3 jdk8u51-b04 ++046d1cfaedc892bfd49570d42dd655338278d476 jdk8u51-b05 ++7875bd6e35fb6af4b150dda213d7812bdb9fcba1 jdk8u51-b06 ++2c7a34442763e809d2cf1459d5b8d6d5528f6494 jdk8u51-b07 ++a96b442d99131e87c7c974a0fa277a5f971732c6 jdk8u51-b08 ++3a95f1e13da9720a6243c0bd41688544b037e182 jdk8u51-b09 ++d99f3f935397fdc65dcb776a97110e8ff5cc519c jdk8u51-b10 ++29612174658436601ba833993227ae96117f632c jdk8u51-b11 ++f07a9ef02d513435e19fd70abcce2871d1c91342 jdk8u51-b12 ++6ef21f3e0946aaab8dc1f4e9cad21dacb97c4f8c jdk8u51-b13 ++5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14 ++54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15 +--- ./corba/.hgtags Tue Mar 17 11:22:27 2015 -0700 ++++ ./corba/.hgtags Mon Jun 01 11:40:22 2015 -0700 +@@ -352,6 +352,7 @@ + f89b454638d89ee5f44422b7a5b8e5651260e68f jdk8u31-b13 + 705d3a4298f44f0a14925bfee5017f5824b6c0ca jdk8u31-b31 + 072d325a052a5894019b74118803bf5fb9e30692 jdk8u31-b32 ++bfd820cde577ba687222196e6c5159d9763df887 jdk8u31-b33 + 7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00 + c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01 + 504b4455570e14b7fc0a837a09c6401c603516d9 jdk8u40-b02 +@@ -380,6 +381,8 @@ + 2220744100b8487976debff79e5d0c7d70738bda jdk8u40-b25 + cab2b99c6bb2e15165a58eaa36157788f82592f1 jdk8u40-b26 + bd0186cd2419129357b110fe3f13519f68b29774 jdk8u40-b27 ++28a1dbd4bb9ec97427790c88d21514af2f878c94 jdk8u40-b31 ++663a3151c688bc3f4c092bcad21cc81e29139d62 jdk8u40-b32 + 5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00 + 6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01 + 3b9d342f9f584465ea5976e06357b45682f9681d jdk8u45-b02 +@@ -394,3 +397,23 @@ + 08c2ce4b6d59bc6b29e61fd8562b9e3d39b257a5 jdk8u45-b11 + c9bf2543c0c045ef31f0296bc355381e1a4bd4ac jdk8u45-b12 + 326f02235e7a9a6da78428410320dcc980827d40 jdk8u45-b13 ++50fb9bed64c9366b7bf68bddcdc553cd7295d905 jdk8u45-b14 ++4afc048fe6ff7fc3fdbdadd8027549805c426d0d jdk8u45-b15 ++e67045c893eaf5e3336c4fd849786fa15b81b601 jdk8u45-b31 ++f2aeb52cb7cef1f984661a583baac67402f633a5 jdk8u45-b32 ++72d116eea419824044f8dd4ae9d3a012946f72a4 jdk8u51-b00 ++b9638b9fe23876fd2413f336ee1d4e05d409e6a9 jdk8u51-b01 ++bc5562ed3c2d69ffbff357e96d9e383479042000 jdk8u51-b02 ++75c09ffd6c62f90153e4b043e0b40db4fa03954d jdk8u51-b03 ++66908961baaec267141b1e80d04feed0c93f68fe jdk8u51-b04 ++1c0a26d561f3a6b2d5a4c91161d7c92409d5f227 jdk8u51-b05 ++dba5c9ee56abce73e1f6ed99a36a99d6907266c6 jdk8u51-b06 ++00d57e68b59879ee59352ae18c7e40216d9e2243 jdk8u51-b07 ++47492841bb10e6c995c68be533d2b4905856a17e jdk8u51-b08 ++b9e5fa1d3f251d5cce02d1e7ff97279064aecdb1 jdk8u51-b09 ++0011162b38bf4dab36c72bf25640c59d7128274a jdk8u51-b10 ++4d59046bdb8a05cfb9e07d8e18d44956f700fe29 jdk8u51-b11 ++e51a2deadf774452d98b339d65d33c72a466a453 jdk8u51-b12 ++4886143e8749caf2ec42a6e77c70a98516e140a3 jdk8u51-b13 ++1fbfa02e524872a75e98ee3a80e2472fa7012fde jdk8u51-b14 ++d6e1f914c954f98caa31edd0037837830774dfb6 jdk8u51-b15 +--- ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Mar 17 11:22:27 2015 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Mon Jun 01 11:40:22 2015 -0700 +@@ -2417,8 +2417,8 @@ + private void throwAwayData(ValueMember[] fields, + com.sun.org.omg.SendingContext.CodeBase sender) + throws InvalidClassException, StreamCorruptedException, +- ClassNotFoundException, IOException +- { ++ ClassNotFoundException, IOException { ++ + for (int i = 0; i < fields.length; ++i) { + + try { +@@ -2553,8 +2553,7 @@ + + } + +- private static void setObjectField(Object o, Class c, String fieldName, Object v) +- { ++ private static void setObjectField(Object o, Class c, String fieldName, Object v) { + try { + Field fld = c.getDeclaredField( fieldName ) ; + Class fieldCl = fld.getType(); +@@ -2564,9 +2563,15 @@ + long key = bridge.objectFieldOffset( fld ) ; + bridge.putObject( o, key, v ) ; + } catch (Exception e) { +- throw utilWrapper.errorSetObjectField( e, fieldName, +- o.toString(), +- v.toString() ) ; ++ if (o != null) { ++ throw utilWrapper.errorSetObjectField( e, fieldName, ++ o.toString(), ++ v.toString() ) ; ++ } else { ++ throw utilWrapper.errorSetObjectField( e, fieldName, ++ "null " + c.getName() + " object", ++ v.toString() ) ; ++ } + } + } + +@@ -2574,12 +2579,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putBoolean( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Boolean.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putBoolean( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { ++ if (o != null) { + throw utilWrapper.errorSetBooleanField( e, fieldName, + o.toString(), + new Boolean(v) ) ; ++ } else { ++ throw utilWrapper.errorSetBooleanField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Boolean(v) ) ; ++ } + } + } + +@@ -2587,12 +2602,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putByte( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Byte.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putByte( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { +- throw utilWrapper.errorSetByteField( e, fieldName, +- o.toString(), +- new Byte(v) ) ; ++ if (o != null) { ++ throw utilWrapper.errorSetByteField( e, fieldName, ++ o.toString(), ++ new Byte(v) ) ; ++ } else { ++ throw utilWrapper.errorSetByteField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Byte(v) ) ; ++ } + } + } + +@@ -2600,12 +2625,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putChar( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Character.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putChar( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { +- throw utilWrapper.errorSetCharField( e, fieldName, +- o.toString(), +- new Character(v) ) ; ++ if (o != null) { ++ throw utilWrapper.errorSetCharField( e, fieldName, ++ o.toString(), ++ new Character(v) ) ; ++ } else { ++ throw utilWrapper.errorSetCharField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Character(v) ) ; ++ } + } + } + +@@ -2613,12 +2648,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putShort( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Short.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putShort( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { ++ if (o != null) { + throw utilWrapper.errorSetShortField( e, fieldName, + o.toString(), + new Short(v) ) ; ++ } else { ++ throw utilWrapper.errorSetShortField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Short(v) ) ; ++ } + } + } + +@@ -2626,12 +2671,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putInt( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Integer.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putInt( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { +- throw utilWrapper.errorSetIntField( e, fieldName, +- o.toString(), +- new Integer(v) ) ; ++ if (o != null) { ++ throw utilWrapper.errorSetIntField( e, fieldName, ++ o.toString(), ++ new Integer(v) ) ; ++ } else { ++ throw utilWrapper.errorSetIntField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Integer(v) ) ; ++ } + } + } + +@@ -2639,12 +2694,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putLong( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Long.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putLong( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { +- throw utilWrapper.errorSetLongField( e, fieldName, +- o.toString(), +- new Long(v) ) ; ++ if (o != null) { ++ throw utilWrapper.errorSetLongField( e, fieldName, ++ o.toString(), ++ new Long(v) ) ; ++ } else { ++ throw utilWrapper.errorSetLongField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Long(v) ) ; ++ } + } + } + +@@ -2652,12 +2717,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putFloat( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Float.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putFloat( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { +- throw utilWrapper.errorSetFloatField( e, fieldName, +- o.toString(), +- new Float(v) ) ; ++ if (o != null) { ++ throw utilWrapper.errorSetFloatField( e, fieldName, ++ o.toString(), ++ new Float(v) ) ; ++ } else { ++ throw utilWrapper.errorSetFloatField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Float(v) ) ; ++ } + } + } + +@@ -2665,12 +2740,22 @@ + { + try { + Field fld = c.getDeclaredField( fieldName ) ; +- long key = bridge.objectFieldOffset( fld ) ; +- bridge.putDouble( o, key, v ) ; ++ if ((fld != null) && (fld.getType() == Double.TYPE)) { ++ long key = bridge.objectFieldOffset( fld ) ; ++ bridge.putDouble( o, key, v ) ; ++ } else { ++ throw new InvalidObjectException("Field Type mismatch"); ++ } + } catch (Exception e) { +- throw utilWrapper.errorSetDoubleField( e, fieldName, +- o.toString(), +- new Double(v) ) ; ++ if (o != null) { ++ throw utilWrapper.errorSetDoubleField( e, fieldName, ++ o.toString(), ++ new Double(v) ) ; ++ } else { ++ throw utilWrapper.errorSetDoubleField( e, fieldName, ++ "null " + c.getName() + " object", ++ new Double(v) ) ; ++ } + } + } + +--- ./hotspot/.hgtags Tue Mar 17 11:22:51 2015 -0700 ++++ ./hotspot/.hgtags Mon Jun 01 11:40:55 2015 -0700 +@@ -565,6 +565,7 @@ + 4206e725d584be942c25ff46ff23d8e299ca4a4c jdk8u31-b13 + b517d3a9aebf0fee64808f9a7c0ef8e0b82d5ed3 jdk8u31-b31 + 15d8108258cb60a58bdd03b9ff8e77dd6727a804 jdk8u31-b32 ++26b1dc6891c4fae03575a9090f7d04bd631d9164 jdk8u31-b33 + 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10 + f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15 + 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11 +@@ -594,6 +595,8 @@ + 698dd28ecc785ffc43e3f12266b13e85382c26a8 jdk8u40-b25 + f39b6944ad447269b81e06ca5da9edff9e9e67c8 jdk8u40-b26 + 6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27 ++8220f68a195f6eeed2f5fb6e8a303726b512e899 jdk8u40-b31 ++850a290eb1088a61178d1910c500e170ef4f4386 jdk8u40-b32 + b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00 + 41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01 + 626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02 +@@ -608,3 +611,23 @@ + f4822d12204179e6a3e7aaf98991b6171670cbf2 jdk8u45-b11 + dc29108bcbcbfcd49eaa9135368306dc85db73a6 jdk8u45-b12 + efbf340fc7f56e49735111c23cef030413146409 jdk8u45-b13 ++5321d26956b283b7cb73b04b91db41c7c9fe9158 jdk8u45-b14 ++a5ba7c9a0b916ea088aaac5d40e17b4675c2b026 jdk8u45-b15 ++894b92a02c533bcd1203c4beb5b6ec067b63466e jdk8u45-b31 ++1428b6aa09c4e17202b801530c3c4993c7ce8e5b jdk8u45-b32 ++b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00 ++c1de2652a48c1d4a0c96707acc73db3cd317df2a jdk8u51-b01 ++8f03c2f5fc170da5fca2cf65734941efb619feca jdk8u51-b02 ++cf295659243009ded76b6c14307c177a02f9fe82 jdk8u51-b03 ++0b3f449553884d88f6c9d7ab067fa858f18cc3f1 jdk8u51-b04 ++6ce994385353023e6b3f9c5ef331f390b324a355 jdk8u51-b05 ++3816de51b5e7d6050584057fae5f2262dae53d7e jdk8u51-b06 ++5c017acbaf015fb8ecca6f00870965f3deb4e1ac jdk8u51-b07 ++631d4029d851b59613e6748e17447001a682276e jdk8u51-b08 ++ce81c4487dd1e9f89d4570a8cd25e349f6bae00d jdk8u51-b09 ++928e1994ad43272f808ca22b9cc1b08a7ce2824f jdk8u51-b10 ++1a122beb9dc6881850ef1d1250f40a83709b8b72 jdk8u51-b11 ++05c80f1060f0c0d5720de9eadd09162af1168eab jdk8u51-b12 ++07e103f3f43886a3b47945e5295eb5accad505de jdk8u51-b13 ++a4eea4bee2d4fdb05f1a8358d70ec6adb1135526 jdk8u51-b14 ++9a70cba6a3c3e44486f9c199d03a16b2b09d0a13 jdk8u51-b15 +--- ./hotspot/make/hotspot_version Tue Mar 17 11:22:51 2015 -0700 ++++ ./hotspot/make/hotspot_version Mon Jun 01 11:40:55 2015 -0700 +@@ -34,8 +34,8 @@ + HOTSPOT_VM_COPYRIGHT=Copyright 2015 + + HS_MAJOR_VER=25 +-HS_MINOR_VER=45 +-HS_BUILD_NUMBER=02 ++HS_MINOR_VER=51 ++HS_BUILD_NUMBER=03 + + JDK_MAJOR_VER=1 + JDK_MINOR_VER=8 +--- ./hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Tue Mar 17 11:22:51 2015 -0700 ++++ ./hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Mon Jun 01 11:40:55 2015 -0700 +@@ -2204,7 +2204,15 @@ + if (log2_scale != 0) { + // temporary fix (platform dependent code without shift on Intel would be better) + // TODO: ARM also allows embedded shift in the address +- __ shift_left(index_op, log2_scale, index_op); ++ LIR_Opr tmp = new_pointer_register(); ++ if (TwoOperandLIRForm) { ++ __ move(index_op, tmp); ++ index_op = tmp; ++ } ++ __ shift_left(index_op, log2_scale, tmp); ++ if (!TwoOperandLIRForm) { ++ index_op = tmp; ++ } + } + + LIR_Address* addr = new LIR_Address(base_op, index_op, x->basic_type()); +--- ./hotspot/src/share/vm/classfile/systemDictionary.cpp Tue Mar 17 11:22:51 2015 -0700 ++++ ./hotspot/src/share/vm/classfile/systemDictionary.cpp Mon Jun 01 11:40:55 2015 -0700 +@@ -2349,9 +2349,6 @@ + assert(!THREAD->is_Compiler_thread(), ""); + Handle method_type = + SystemDictionary::find_method_handle_type(signature, accessing_klass, CHECK_(empty)); +- if (false) { // FIXME: Decide if the Java upcall should resolve signatures. +- method_type = java_lang_String::create_from_symbol(signature, CHECK_(empty)); +- } + + KlassHandle mh_klass = SystemDictionary::MethodHandle_klass(); + int ref_kind = JVM_REF_invokeVirtual; +@@ -2383,6 +2380,24 @@ + return unpack_method_and_appendix(mname, accessing_klass, appendix_box, appendix_result, THREAD); + } + ++// Decide if we can globally cache a lookup of this class, to be returned to any client that asks. ++// We must ensure that all class loaders everywhere will reach this class, for any client. ++// This is a safe bet for public classes in java.lang, such as Object and String. ++// We also include public classes in java.lang.invoke, because they appear frequently in system-level method types. ++// Out of an abundance of caution, we do not include any other classes, not even for packages like java.util. ++static bool is_always_visible_class(oop mirror) { ++ Klass* klass = java_lang_Class::as_Klass(mirror); ++ if (klass->oop_is_objArray()) { ++ klass = ObjArrayKlass::cast(klass)->bottom_klass(); // check element type ++ } ++ if (klass->oop_is_typeArray()) { ++ return true; // primitive array ++ } ++ assert(klass->oop_is_instance(), klass->external_name()); ++ return klass->is_public() && ++ (InstanceKlass::cast(klass)->is_same_class_package(SystemDictionary::Object_klass()) || // java.lang ++ InstanceKlass::cast(klass)->is_same_class_package(SystemDictionary::MethodHandle_klass())); // java.lang.invoke ++} + + // Ask Java code to find or construct a java.lang.invoke.MethodType for the given + // signature, as interpreted relative to the given class loader. +@@ -2405,32 +2420,33 @@ + } + + Handle class_loader, protection_domain; +- bool is_on_bcp = true; // keep this true as long as we can materialize from the boot classloader ++ if (accessing_klass.not_null()) { ++ class_loader = Handle(THREAD, InstanceKlass::cast(accessing_klass())->class_loader()); ++ protection_domain = Handle(THREAD, InstanceKlass::cast(accessing_klass())->protection_domain()); ++ } ++ bool can_be_cached = true; + int npts = ArgumentCount(signature).size(); + objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty)); + int arg = 0; +- Handle rt; // the return type from the signature ++ Handle rt; // the return type from the signature + ResourceMark rm(THREAD); + for (SignatureStream ss(signature); !ss.is_done(); ss.next()) { + oop mirror = NULL; +- if (is_on_bcp) { +- // Note: class_loader & protection_domain are both null at this point. +- mirror = ss.as_java_mirror(class_loader, protection_domain, ++ if (can_be_cached) { ++ // Use neutral class loader to lookup candidate classes to be placed in the cache. ++ mirror = ss.as_java_mirror(Handle(), Handle(), + SignatureStream::ReturnNull, CHECK_(empty)); +- if (mirror == NULL) { +- // fall back from BCP to accessing_klass +- if (accessing_klass.not_null()) { +- class_loader = Handle(THREAD, InstanceKlass::cast(accessing_klass())->class_loader()); +- protection_domain = Handle(THREAD, InstanceKlass::cast(accessing_klass())->protection_domain()); +- } +- is_on_bcp = false; ++ if (mirror == NULL || (ss.is_object() && !is_always_visible_class(mirror))) { ++ // Fall back to accessing_klass context. ++ can_be_cached = false; + } + } +- if (!is_on_bcp) { ++ if (!can_be_cached) { + // Resolve, throwing a real error if it doesn't work. + mirror = ss.as_java_mirror(class_loader, protection_domain, + SignatureStream::NCDFError, CHECK_(empty)); + } ++ assert(!oopDesc::is_null(mirror), ss.as_symbol(THREAD)->as_C_string()); + if (ss.at_return_type()) + rt = Handle(THREAD, mirror); + else +@@ -2462,7 +2478,7 @@ + &args, CHECK_(empty)); + Handle method_type(THREAD, (oop) result.get_jobject()); + +- if (is_on_bcp) { ++ if (can_be_cached) { + // We can cache this MethodType inside the JVM. + MutexLocker ml(SystemDictionary_lock, THREAD); + spe = invoke_method_table()->find_entry(index, hash, signature, null_iid); +--- ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Tue Mar 17 11:22:51 2015 -0700 ++++ ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Mon Jun 01 11:40:55 2015 -0700 +@@ -68,11 +68,11 @@ + + ~JvmtiConstantPoolReconstituter() { + if (_symmap != NULL) { +- os::free(_symmap, mtClass); ++ delete _symmap; + _symmap = NULL; + } + if (_classmap != NULL) { +- os::free(_classmap, mtClass); ++ delete _classmap; + _classmap = NULL; + } + } +--- ./jaxp/.hgtags Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/.hgtags Mon Jun 01 11:41:52 2015 -0700 +@@ -354,6 +354,7 @@ + 1dd828fd98f1b84de5dcadb904322b711e7489ff jdk8u31-b13 + dcc563c9db9ef290a0783378d43a039cd92a08e3 jdk8u31-b31 + 119f4ae3151f4134a5e62034e66a4c17f524838b jdk8u31-b32 ++d8a594fd8507343dc23fa18c01b17c96fced47fd jdk8u31-b33 + 3a1bba8076da4e54882123e98e219eab1c31ccef jdk8u40-b00 + f219da378d0768ff042d77221e5d20676ecc16f0 jdk8u40-b01 + 16ef2134c32a4e60b5a60105b371163aa5936278 jdk8u40-b02 +@@ -382,6 +383,8 @@ + 4c0d4c38279c5790aa5b61b03c4cfa9b2a58bc72 jdk8u40-b25 + f693ef62c207dd0290957c95bd62ab653afe4626 jdk8u40-b26 + 56f6ca79467d04eb95383102046836b6ac7d2811 jdk8u40-b27 ++7e43d4e20a33b8b6bd06112e39d367b51de921a7 jdk8u40-b31 ++8facbe662ec106f1aae271f5c59909e124938c40 jdk8u40-b32 + 9286acc600a779acb8bcfab38e82d4f50704afe3 jdk8u45-b00 + 9fded65e1d36e3388111955d50ebf8511dd0345e jdk8u45-b01 + 62566a3dbe5982565ce3e468ee3980b7937a86cc jdk8u45-b02 +@@ -396,3 +399,23 @@ + d4042340fe0aa9d33a161890e179bc21b6c7b8e6 jdk8u45-b11 + 91d1102264e9b58b2ada4b5f112d472f0d86092b jdk8u45-b12 + a15025742f201f05ead3d731780a4ad437524491 jdk8u45-b13 ++e0167ec9d7596ab9ac52a8c3b85c1aef5d3fbd92 jdk8u45-b14 ++bf813e10d0bac17866ef2389baa8a1e6494e7800 jdk8u45-b15 ++74452b827b62c31220709d14a65e71f37795199a jdk8u45-b31 ++90fe13eb35388e095383bcb81eeb6d24875e3054 jdk8u45-b32 ++ef437e576e3654f6f9c0cc116a0a824f382b9007 jdk8u51-b00 ++d6ddc9950ff55dc9be44704ed59555e221a8fcc9 jdk8u51-b01 ++da0ad0f75f08d8fbb4ee4d395e4386a4660b854e jdk8u51-b02 ++34737dfadd630afba60b6ad63a696ae335d7e960 jdk8u51-b03 ++75f055aeee9f9cab28a58e1deea9ecb8885b63d0 jdk8u51-b04 ++5e57ca784de9ce92547c12d0bc3795c42794b962 jdk8u51-b05 ++36c97b41563b7bed72014da6e497398c78616d5b jdk8u51-b06 ++046bcf8f8e0059fa53136b06547112933d5284d6 jdk8u51-b07 ++710b56801de0147716d91be7226b125b5a64c2ef jdk8u51-b08 ++3b4c837abdf678ea2e60efcd2d20cc9ff1123c06 jdk8u51-b09 ++7aacd8c67160af67f7c9d81974d021eeb229929e jdk8u51-b10 ++04005432fba4982e5c073be55b917f8a11c838f0 jdk8u51-b11 ++966c04d5702882603a02f5ba4a4e5d19d47960f6 jdk8u51-b12 ++3f5353208a226a31d9ad86018a17fe5f3b102d4b jdk8u51-b13 ++361ad9121468776eee1d647044481d80e8334ffa jdk8u51-b14 ++14975d905d764c5a18b60b991b97375d42dcecd7 jdk8u51-b15 +--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Mon Jun 01 11:41:52 2015 -0700 +@@ -1223,10 +1223,10 @@ + "Gammal syntax: Namnet p\u00E5 'expr'-attributet har \u00E4ndrats till 'select'."}, + + { WG_NO_LOCALE_IN_FORMATNUMBER, +- "Xalan hanterar \u00E4nnu inte spr\u00E5knamnet i funktionen format-number."}, ++ "Xalan hanterar \u00E4nnu inte spr\u00E5kkonventionen i funktionen format-number."}, + + { WG_LOCALE_NOT_FOUND, +- "Varning: Hittade inte spr\u00E5kinst\u00E4llning f\u00F6r xml:lang={0}"}, ++ "Varning: Hittade inte spr\u00E5kkonvention f\u00F6r xml:lang={0}"}, + + { WG_CANNOT_MAKE_URL_FROM, + "Kan inte skapa URL fr\u00E5n: {0}"}, +@@ -1326,8 +1326,8 @@ + { "version", ">>>>>>> Xalan version "}, + { "version2", "<<<<<<<"}, + { "yes", "ja"}, +- { "line", "Rad #"}, +- { "column","Kolumn #"}, ++ { "line", "Rad nr"}, ++ { "column","Kolumn nr"}, + { "xsldone", "XSLProcessor: utf\u00F6rd"}, + + +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory erkennt Attribut \"{0}\" nicht."}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "Falscher Wert f\u00FCr Attribut ''{0}'' angegeben."}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory no reconoce el atributo ''{0}''."}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "Valor no v\u00E1lido especificado para el atributo ''{0}''."}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory ne reconna\u00EEt pas l''attribut ''{0}''."}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "La valeur indiqu\u00E9e pour l''attribut ''{0}'' est incorrecte."}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory non riconosce l''attributo ''{0}''."}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "Valore errato specificato per l''attributo ''{0}''."}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory\u306F\u5C5E\u6027''{0}''\u3092\u8A8D\u8B58\u3057\u307E\u305B\u3093\u3002"}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "''{0}''\u5C5E\u6027\u306B\u6307\u5B9A\u3055\u308C\u305F\u5024\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002"}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory\uC5D0\uC11C ''{0}'' \uC18D\uC131\uC744 \uC778\uC2DD\uD558\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4."}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "''{0}'' \uC18D\uC131\uC5D0 \uB300\uD574 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uAC12\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4."}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory n\u00E3o reconhece o atributo ''{0}''."}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "Valor incorreto especificado para o atributo ''{0}''."}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory k\u00E4nner inte igen attributet ''{0}''."}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "Fel v\u00E4rde har angetts f\u00F6r attributet ''{0}''."}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory \u65E0\u6CD5\u8BC6\u522B\u5C5E\u6027 ''{0}''\u3002"}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "\u4E3A ''{0}'' \u5C5E\u6027\u6307\u5B9A\u7684\u503C\u4E0D\u6B63\u786E\u3002"}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Mon Jun 01 11:41:52 2015 -0700 +@@ -597,6 +597,9 @@ + {ErrorMsg.JAXP_INVALID_ATTR_ERR, + "TransformerFactory \u7121\u6CD5\u8FA8\u8B58\u5C6C\u6027 ''{0}''\u3002"}, + ++ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, ++ "\u70BA ''{0}'' \u5C6C\u6027\u6307\u5B9A\u7684\u503C\u4E0D\u6B63\u78BA\u3002"}, ++ + /* + * Note to translators: "setResult()" and "startDocument()" are Java + * method names that should not be translated. +--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Mon Jun 01 11:41:52 2015 -0700 +@@ -270,7 +270,7 @@ + if (Double.isNaN(start)) + return(EMPTYSTRING); + +- final int strlen = value.length(); ++ final int strlen = getStringLength(value); + int istart = (int)Math.round(start) - 1; + + if (istart > strlen) +@@ -278,6 +278,7 @@ + if (istart < 1) + istart = 0; + try { ++ istart = value.offsetByCodePoints(0, istart); + return value.substring(istart); + } catch (IndexOutOfBoundsException e) { + runTimeError(RUN_TIME_INTERNAL_ERR, "substring()"); +@@ -297,24 +298,30 @@ + return(EMPTYSTRING); + + int istart = (int)Math.round(start) - 1; ++ int ilength = (int)Math.round(length); + final int isum; + if (Double.isInfinite(length)) + isum = Integer.MAX_VALUE; + else +- isum = istart + (int)Math.round(length); ++ isum = istart + ilength; + +- final int strlen = value.length(); ++ final int strlen = getStringLength(value); + if (isum < 0 || istart > strlen) + return(EMPTYSTRING); + +- if (istart < 0) ++ if (istart < 0) { ++ ilength += istart; + istart = 0; ++ } + + try { +- if (isum > strlen) ++ istart = value.offsetByCodePoints(0, istart); ++ if (isum > strlen) { + return value.substring(istart); +- else +- return value.substring(istart, isum); ++ } else { ++ int offset = value.offsetByCodePoints(istart, ilength); ++ return value.substring(istart, offset); ++ } + } catch (IndexOutOfBoundsException e) { + runTimeError(RUN_TIME_INTERNAL_ERR, "substring()"); + return null; +--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Mon Jun 01 11:41:52 2015 -0700 +@@ -1418,7 +1418,7 @@ + // AttValue + boolean isVC = !fStandalone && (fSeenExternalDTD || fSeenExternalPE) ; + scanAttributeValue(defaultVal, nonNormalizedDefaultVal, atName, +- fAttributes, 0, isVC); ++ fAttributes, 0, isVC, elName); + } + return defaultType; + +--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Mon Jun 01 11:41:52 2015 -0700 +@@ -1546,7 +1546,7 @@ + + scanAttributeValue(tmpStr, fTempString2, + fAttributeQName.rawname, attributes, +- attIndex, isVC); ++ attIndex, isVC, fCurrentElement.rawname); + + // content + int oldLen = attributes.getLength(); +--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Mon Jun 01 11:41:52 2015 -0700 +@@ -438,7 +438,7 @@ + XMLString tmpStr = getString(); + scanAttributeValue(tmpStr, fTempString2, + fAttributeQName.rawname, attributes, +- attrIndex, isVC); ++ attrIndex, isVC, fCurrentElement.rawname); + + String value = null; + //fTempString.toString(); +--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Mon Jun 01 11:41:52 2015 -0700 +@@ -812,6 +812,7 @@ + * @param attrIndex The index of the attribute to use from the list. + * @param checkEntities true if undeclared entities should be reported as VC violation, + * false if undeclared entities should be reported as WFC violation. ++ * @param eleName The name of element to which this attribute belongs. + * + * <strong>Note:</strong> This method uses fStringBuffer2, anything in it + * at the time of calling is lost. +@@ -820,13 +821,13 @@ + XMLString nonNormalizedValue, + String atName, + XMLAttributes attributes, int attrIndex, +- boolean checkEntities) ++ boolean checkEntities, String eleName) + throws IOException, XNIException { + XMLStringBuffer stringBuffer = null; + // quote + int quote = fEntityScanner.peekChar(); + if (quote != '\'' && quote != '"') { +- reportFatalError("OpenQuoteExpected", new Object[]{atName}); ++ reportFatalError("OpenQuoteExpected", new Object[]{eleName, atName}); + } + + fEntityScanner.scanChar(); +@@ -952,7 +953,7 @@ + } + } else if (c == '<') { + reportFatalError("LessthanInAttValue", +- new Object[] { null, atName }); ++ new Object[] { eleName, atName }); + fEntityScanner.scanChar(); + if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) { + fStringBuffer2.append((char)c); +@@ -987,7 +988,7 @@ + } + } else if (c != -1 && isInvalidLiteral(c)) { + reportFatalError("InvalidCharInAttValue", +- new Object[] {Integer.toString(c, 16)}); ++ new Object[] {eleName, atName, Integer.toString(c, 16)}); + fEntityScanner.scanChar(); + if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) { + fStringBuffer2.append((char)c); +@@ -1016,7 +1017,7 @@ + // quote + int cquote = fEntityScanner.scanChar(); + if (cquote != quote) { +- reportFatalError("CloseQuoteExpected", new Object[]{atName}); ++ reportFatalError("CloseQuoteExpected", new Object[]{eleName, atName}); + } + } // scanAttributeValue() + +--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Mon Jun 01 11:41:52 2015 -0700 +@@ -121,7 +121,7 @@ + InvalidByte = Ogiltig byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte. + ExpectedByte = F\u00F6rv\u00E4ntad byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte. + InvalidHighSurrogate = H\u00F6ga surrogatbitar i UTF-8-sekvens f\u00E5r inte \u00F6verskrida 0x10, men 0x{0} hittades. +- OperationNotSupported = Operation "{0}" st\u00F6ds inte i l\u00E4saren {1}. ++ OperationNotSupported = \u00C5tg\u00E4rden "{0}" st\u00F6ds inte i l\u00E4saren {1}. + InvalidASCII = Byte "{0}" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar). + CharConversionFailure = En enhet som fastst\u00E4lls anv\u00E4nda ett visst kodformat f\u00E5r inte inneh\u00E5lla sekvenser som \u00E4r otill\u00E5tna i kodningen. + +--- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Mon Jun 01 11:41:52 2015 -0700 +@@ -375,8 +375,8 @@ + + { "BAD_CODE", "Parameter f\u00F6r createMessage ligger utanf\u00F6r gr\u00E4nsv\u00E4rdet"}, + { "FORMAT_FAILED", "Undantag utl\u00F6st vid messageFormat-anrop"}, +- { "line", "Rad #"}, +- { "column","Kolumn #"}, ++ { "line", "Rad nr"}, ++ { "column","Kolumn nr"}, + + {ER_SERIALIZER_NOT_CONTENTHANDLER, + "Serializerklassen ''{0}'' implementerar inte org.xml.sax.ContentHandler."}, +--- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Tue Mar 17 11:23:49 2015 -0700 ++++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Mon Jun 01 11:41:52 2015 -0700 +@@ -480,7 +480,7 @@ + "FEL! Hittade inte ENDOP efter OP_LOCATIONPATH"}, + + { ER_ERROR_OCCURED, +- "Fel intr\u00E4ffade!"}, ++ "Ett fel har intr\u00E4ffat!"}, + + { ER_ILLEGAL_VARIABLE_REFERENCE, + "VariableReference angiven f\u00F6r variabel som \u00E4r utanf\u00F6r kontext eller som saknar definition! Namn = {0}"}, +@@ -825,7 +825,7 @@ + // Warnings... + + { WG_LOCALE_NAME_NOT_HANDLED, +- "spr\u00E5knamnet i funktionen format-number har \u00E4nnu inte hanterats!"}, ++ "spr\u00E5kkonventionsnamnet i funktionen format-number har \u00E4nnu inte hanterats!"}, + + { WG_PROPERTY_NOT_SUPPORTED, + "XSL-egenskapen st\u00F6ds inte: {0}"}, +@@ -871,8 +871,8 @@ + { "version", ">>>>>>> Xalan version "}, + { "version2", "<<<<<<<"}, + { "yes", "ja"}, +- { "line", "Rad #"}, +- { "column", "Kolumn #"}, ++ { "line", "Rad nr"}, ++ { "column", "Kolumn nr"}, + { "xsldone", "XSLProcessor: utf\u00F6rd"}, + { "xpath_option", "xpath-alternativ: "}, + { "optionIN", " [-in inputXMLURL]"}, +--- ./jaxws/.hgtags Tue Mar 17 11:23:59 2015 -0700 ++++ ./jaxws/.hgtags Mon Jun 01 11:42:03 2015 -0700 +@@ -352,6 +352,7 @@ + 9d0c737694ece23547c0a27dcd0ba6cbcdf577f2 jdk8u31-b13 + 49e91817cbe1b14f856c26f6e55b7151e3f8c3a8 jdk8u31-b31 + 9e20c5acb448c5f9b05a4e9b4efc222b3b616c23 jdk8u31-b32 ++ea23d583e36301301612946d34ff6aa90d795dd9 jdk8u31-b33 + 31d43d250c836c13fcc87025837783788c5cd0de jdk8u40-b00 + 262fb5353ffa661f88b4a9cf2581fcad8c2a43f7 jdk8u40-b01 + 8043f77ef8a4ded9505269a356c4e2f4f9604cd9 jdk8u40-b02 +@@ -380,6 +381,8 @@ + b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25 + 1bcb30bdd9883cc7fc1bf70800ea03a4429eaa80 jdk8u40-b26 + a5f2cdedb940511674e153dce8d3cbc3a0598c9e jdk8u40-b27 ++a342e6841e8d3bbef44d4158c980be2ab903e10a jdk8u40-b31 ++8960bce00f1abecad665291b0077d6e673c0ff64 jdk8u40-b32 + 667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00 + cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01 + 855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02 +@@ -394,3 +397,23 @@ + 855fd9dfcbee177b508413dbab6e46b57dd367c4 jdk8u45-b11 + 3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12 + 15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13 ++bad02ac45d59b5096032cf42bb880dcddffa84b4 jdk8u45-b14 ++cc7d796b8f12cc11d415f8ae0ef2d952274fc069 jdk8u45-b15 ++8a7494ab96913de396a8f38dd324ac52c44b1a80 jdk8u45-b31 ++1c022144b99b859336914740e571c672e51ee1b9 jdk8u45-b32 ++74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00 ++78d8cafb17e46dd2453704f679ca1e431e4df0ba jdk8u51-b01 ++9bd6f57d97e5423d5f25774b095124cbe1eeb9c1 jdk8u51-b02 ++a9ed1bcefec1ee0d30ea8cf700cf0813d8588eb0 jdk8u51-b03 ++3d07c26d5012f47ef274043a6204db686769d65d jdk8u51-b04 ++834da1120e80f17356475a5d3f06a678355dbbf6 jdk8u51-b05 ++243ba3774d18cfe2e56fa0e0474255787c360d07 jdk8u51-b06 ++13d1721eae3bdea08dcd7b84e0856e6769caafc9 jdk8u51-b07 ++cbba234a2b481b236e2bf78c892111b86f6bba81 jdk8u51-b08 ++9116c6bb2ffa6bb624ad39f7a98b7b9bed4512dc jdk8u51-b09 ++783b917616ab6977f9b3157667d1493636ba66d1 jdk8u51-b10 ++5a69995912aae8bd61758e95a3b5edac167b6acc jdk8u51-b11 ++1a855f69de645c4bd485d5fb6d9a524994278a16 jdk8u51-b12 ++880b67345f557d5613071d09c1cf234a7e1b8759 jdk8u51-b13 ++4a6824c3fd8d74f83daac1a79952786837a9848c jdk8u51-b14 ++dde8e5b2366b9a08d7448c3cef2cabc710cc9da5 jdk8u51-b15 +--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Tue Mar 17 11:23:59 2015 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Mon Jun 01 11:42:03 2015 -0700 +@@ -30,7 +30,12 @@ + import com.sun.source.util.Trees; + import com.sun.xml.internal.bind.v2.model.nav.Navigator; + import com.sun.xml.internal.bind.v2.runtime.Location; +- ++import java.lang.annotation.Annotation; ++import java.util.ArrayList; ++import java.util.Collection; ++import java.util.HashMap; ++import java.util.List; ++import java.util.Map; + import javax.annotation.processing.ProcessingEnvironment; + import javax.lang.model.element.AnnotationMirror; + import javax.lang.model.element.Element; +@@ -52,12 +57,6 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507191423.t6JENtFO097963>