/hg/icedtea7: 4 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Mar 25 00:37:15 UTC 2016


changeset 5350567049b8 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5350567049b8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jan 25 16:35:56 2016 +0000

	Added tag icedtea-2.7.0pre03 for changeset 151921e40c23


changeset 6d54f9071b09 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=6d54f9071b09
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jan 25 16:36:05 2016 +0000

	Added tag icedtea-2.7.0pre04 for changeset bffa3455fa17


changeset 673f09017f15 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=673f09017f15
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jan 25 16:38:42 2016 +0000

	Add 2.6.4 release notes.

	2016-01-25  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* NEWS: Add 2.6.4 release notes.


changeset dd3689584733 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=dd3689584733
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 25 00:37:24 2016 +0000

	PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed

	2016-03-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patch.
		* NEWS: Updated.
		* patches/cacao/pr2781-refactoring_error.patch:
		Backport of refactoring fix from
		https://bitbucket.org/Ringdingcoder/cacao-staging


diffstat:

 .hgtags                                      |    2 +
 ChangeLog                                    |   15 +++
 Makefile.am                                  |    3 +-
 NEWS                                         |   41 ++++++++++
 patches/cacao/pr2781-refactoring_error.patch |  107 +++++++++++++++++++++++++++
 5 files changed, 167 insertions(+), 1 deletions(-)

diffs (206 lines):

diff -r ac0e7ec6e958 -r dd3689584733 .hgtags
--- a/.hgtags	Wed Jan 06 05:23:06 2016 +0000
+++ b/.hgtags	Fri Mar 25 00:37:24 2016 +0000
@@ -61,3 +61,5 @@
 3a63a970912e5598c8ee954049d242a1e73463e1 icedtea-2.7.0pre00
 76134451270371bdac34762f6057b9fe22ebacca icedtea-2.7.0pre01
 4745f645086fb78e96ffcaf51c739d901293dcfa icedtea-2.7.0pre02
+151921e40c2386edf2b1b2b2fff1b0adfeed0108 icedtea-2.7.0pre03
+bffa3455fa17c8caa472039d217a15ba5d4b235e icedtea-2.7.0pre04
diff -r ac0e7ec6e958 -r dd3689584733 ChangeLog
--- a/ChangeLog	Wed Jan 06 05:23:06 2016 +0000
+++ b/ChangeLog	Fri Mar 25 00:37:24 2016 +0000
@@ -1,3 +1,18 @@
+2016-03-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays:
+	Assertion `dest && result && x.any && y.any' failed
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Updated.
+	* patches/cacao/pr2781-refactoring_error.patch:
+	Backport of refactoring fix from
+	https://bitbucket.org/Ringdingcoder/cacao-staging
+
+2016-01-25  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* NEWS: Add 2.6.4 release notes.
+
 2016-01-06  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	PR2684: AArch64 port not selected on architectures
diff -r ac0e7ec6e958 -r dd3689584733 Makefile.am
--- a/Makefile.am	Wed Jan 06 05:23:06 2016 +0000
+++ b/Makefile.am	Fri Mar 25 00:37:24 2016 +0000
@@ -383,7 +383,8 @@
 	patches/cacao/memory.patch \
 	patches/cacao/pr2032.patch \
 	patches/cacao/pr2520-tempdir.patch \
-	patches/cacao/pr2652-classloader.patch
+	patches/cacao/pr2652-classloader.patch \
+	patches/cacao/pr2781-refactoring_error.patch
 else
 if USING_CACAO
 ICEDTEA_PATCHES += \
diff -r ac0e7ec6e958 -r dd3689584733 NEWS
--- a/NEWS	Wed Jan 06 05:23:06 2016 +0000
+++ b/NEWS	Fri Mar 25 00:37:24 2016 +0000
@@ -14,6 +14,47 @@
 
 New in release 2.7.0 (201X-XX-XX):
 
+* CACAO
+  - PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
+
+New in release 2.6.4 (2016-01-19):
+
+* Security fixes
+  - S8059054, CVE-2016-0402: Better URL processing
+  - S8130710, CVE-2016-0448: Better attributes processing
+  - S8132210: Reinforce JMX collector internals
+  - S8132988: Better printing dialogues
+  - S8133962, CVE-2016-0466: More general limits
+  - S8137060: JMX memory management improvements
+  - S8139012: Better font substitutions
+  - S8139017, CVE-2016-0483: More stable image decoding
+  - S8140543, CVE-2016-0494: Arrange font actions
+  - S8143185: Cleanup for handling proxies
+  - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays
+  - S8144773, CVE-2015-7575: Further reduce use of MD5 (SLOTH)
+* Import of OpenJDK 7 u95 build 0
+  - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified
+  - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException
+  - S8074068: Cleanup in src/share/classes/sun/security/x509/
+  - S8075773: jps running as root fails after the fix of JDK-8050807
+  - S8081297: SSL Problem with Tomcat
+  - S8131181: Increment minor version of HSx for 7u95 and initialize the build number
+  - S8132082: Let OracleUcrypto accept RSAPrivateKey
+  - S8134605: Partial rework of the fix for 8081297
+  - S8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name
+  - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing
+  - S8138716: (tz) Support tzdata2015g
+  - S8140244: Port fix of JDK-8075773 to MacOSX
+  - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS
+  - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2
+  - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure
+  - S8143132: L10n resource file translation update
+  - S8144955: Wrong changes were pushed with 8143942
+  - S8145551: Test failed with Crash for Improved font lookups
+  - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp
+* Backports
+  - S8140244: Port fix of JDK-8075773 to AIX
+
 New in release 2.6.3 (2015-11-13):
 
 * Security fixes
diff -r ac0e7ec6e958 -r dd3689584733 patches/cacao/pr2781-refactoring_error.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2781-refactoring_error.patch	Fri Mar 25 00:37:24 2016 +0000
@@ -0,0 +1,107 @@
+# HG changeset patch
+# User Stefan Ring <stefan at complang.tuwien.ac.at>
+# Date 1453933756 -3600
+# Node ID 4982d429274b9498ad2629ea4f28566ed69e4775
+# Parent  1cef439b53ee701662059ae50874d55c7b5302d7
+PR195: Fix some oversights during a large macro cleanup in 1e9787c3484e
+
+diff --git cacao/cacao/src/vm/jit/verify/typecheck-common.cpp cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+--- cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
++++ cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+@@ -281,7 +281,7 @@
+ 
+ 		dv->type = sv->type;
+ 		if (dv->type == TYPE_ADR) {
+-			dv->typeinfo = sv->typeinfo;
++			typeinfo_t::clone(sv->typeinfo, dv->typeinfo);
+ 		}
+ 	}
+ 	return true;
+diff --git cacao/cacao/src/vm/jit/verify/typeinfo.cpp cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+--- cacao/cacao/src/vm/jit/verify/typeinfo.cpp
++++ cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+@@ -1674,6 +1674,7 @@
+ 	classref_or_classinfo common;
+ 	classref_or_classinfo elementclass;
+ 	int dimension;
++	ArrayType new_elementtype;
+ 	bool changed;
+ 	typecheck_result r;
+ 
+@@ -1784,23 +1785,23 @@
+          * interpret it as an array (same dim. as x) of Arraystubs. */
+         if (x->dimension < src->dimension) {
+             dimension = x->dimension;
+-            elementtype = ARRAYTYPE_OBJECT;
++            new_elementtype = ARRAYTYPE_OBJECT;
+             elementclass.cls = pseudo_class_Arraystub;
+         }
+         else {
+             dimension    = src->dimension;
+-            elementtype  = src->elementtype;
++            new_elementtype = src->elementtype;
+             elementclass = src->elementclass;
+         }
+         
+         /* {The arrays are of the same dimension.} */
+         
+-        if (x->elementtype != elementtype) {
++        if (x->elementtype != new_elementtype) {
+             /* Different element types are merged, so the resulting array
+              * type has one accessible dimension less. */
+             if (--dimension == 0) {
+                 common.cls       = pseudo_class_Arraystub;
+-                elementtype      = ARRAYTYPE_INT;
++                new_elementtype = ARRAYTYPE_INT;
+                 elementclass.any = NULL;
+             }
+             else {
+@@ -1810,14 +1811,14 @@
+ 					return typecheck_FAIL;
+ 				}
+ 
+-                elementtype      = ARRAYTYPE_OBJECT;
++                new_elementtype = ARRAYTYPE_OBJECT;
+                 elementclass.cls = pseudo_class_Arraystub;
+             }
+         }
+         else {
+             /* {The arrays have the same dimension and elementtype.} */
+ 
+-            if (elementtype == ARRAYTYPE_OBJECT) {
++            if (new_elementtype == ARRAYTYPE_OBJECT) {
+                 /* The elements are references, so their respective
+                  * types must be merged.
+                  */
+@@ -1862,7 +1863,7 @@
+ 		changed |= r;
+ 
+         dimension        = 0;
+-        elementtype      = ARRAYTYPE_INT;
++        new_elementtype = ARRAYTYPE_INT;
+         elementclass.any = NULL;
+     }
+ 
+@@ -1876,8 +1877,8 @@
+         this->dimension = dimension;
+         changed = true;
+     }
+-    if (this->elementtype != elementtype) {
+-        this->elementtype = elementtype;
++    if (elementtype != new_elementtype) {
++        elementtype = new_elementtype;
+         changed = true;
+     }
+     if (this->elementclass.any != elementclass.any) {
+diff --git cacao/cacao/src/vm/resolve.cpp cacao/cacao/src/vm/resolve.cpp
+--- cacao/cacao/src/vm/resolve.cpp
++++ cacao/cacao/src/vm/resolve.cpp
+@@ -703,7 +703,7 @@
+ 
+ 	/* uninitialized objects are illegal here */
+ 
+-	if (subtinfo->is_primitive()) {
++	if (subtinfo->is_newobject()) {
+ 		exceptions_throw_verifyerror(refmethod,
+ 				"Invalid use of uninitialized object");
+ 		return resolveFailed;


More information about the distro-pkg-dev mailing list