dev-java/icedtea: Patch against icedtea bug #2781

CACAO have now fixed this upstream and it will hopefully make it into
the next icedtea release.

Package-Manager: portage-2.2.26

diff --git a/dev-java/icedtea/files/icedtea-bug-2781.patch b/dev-java/icedtea/files/icedtea-bug-2781.patch
new file mode 100644 (file)
index 0000000..5cc32c3
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-bug-2781.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User Stefan Ring <stefan@complang.tuwien.ac.at>
+# Date 1452083014 -3600
+# Node ID 9295d3c06eb706407b5af1412674c8f0a0ce9fdf
+# Parent  468081e3e037df27b6427aa298dfaaa20f4ba4bf
+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 elementtype;
+       bool changed;
+       typecheck_result r;
+ 
+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;

diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
index bd433a434c7a4cae69118318bb4f35dcdbfba72b..7621ae171394196c14f30d6a56983b70976f6124 100644 (file)
--- a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
@@ -266,8 +266,9 @@ src_configure() {
                cacao_config="--enable-cacao"
 
                # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
-               export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
-               ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
+               # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781
+               export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch icedtea-bug-2781.patch"
+               ln -snf "${FILESDIR}"/{${SLOT}-cacao-pr-157,icedtea-bug-2781}.patch . || die
        fi
 
        # Turn on Zero if needed (non-HS/CACAO archs) or requested