/hg/icedtea6: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Apr 16 10:40:01 PDT 2013
changeset db7918fff199 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=db7918fff199
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Apr 16 17:01:34 2013 +0100
PR1319: Use #if not #ifdef in giflib 5 patch.
2013-04-16 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/pr1319-support_giflib_5.patch,
Use #if not #ifdef.
changeset ef687bd533e2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ef687bd533e2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Apr 16 17:08:54 2013 +0100
PR1338: Remove dependence on libXp.
2013-04-16 Andrew John Hughes <gnu.andrew at redhat.com>
PR1338: Remove dependence on libXp
* configure.ac: Drop check for libXp.
changeset f9540cbade1e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9540cbade1e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Apr 16 17:11:46 2013 +0100
PR1339: Simplify the rewriter, avoiding concurrency.
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1339: Simplify the rewriter, avoiding concurrency.
* rewriter/com/redhat/rewriter/ClassRewriter.java:
Always use the single threaded executor.
* NEWS: Updated with this and previous fix.
changeset ab418eb1e664 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ab418eb1e664
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Apr 16 18:39:51 2013 +0100
Fix typo in ICEDTEA_PATCHES.
2013-04-16 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add missing backslash (oops!)
* patches/openjdk/7024568-long_method_resolution_oom_error.patch:
Fix patch that doesn't apply cleanly.
diffstat:
ChangeLog | 24 ++++
Makefile.am | 2 +-
NEWS | 2 +
configure.ac | 10 -
patches/openjdk/7024568-long_method_resolution_oom_error.patch | 59 +++------
patches/pr1319-support_giflib_5.patch | 2 +-
rewriter/com/redhat/rewriter/ClassRewriter.java | 6 +-
7 files changed, 54 insertions(+), 51 deletions(-)
diffs (209 lines):
diff -r 44dda0c0c865 -r ab418eb1e664 ChangeLog
--- a/ChangeLog Sun Apr 14 21:05:17 2013 +0100
+++ b/ChangeLog Tue Apr 16 18:39:51 2013 +0100
@@ -1,3 +1,27 @@
+2013-04-16 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add missing backslash (oops!)
+ * patches/openjdk/7024568-long_method_resolution_oom_error.patch:
+ Fix patch that doesn't apply cleanly.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1339: Simplify the rewriter, avoiding concurrency.
+ * rewriter/com/redhat/rewriter/ClassRewriter.java:
+ Always use the single threaded executor.
+ * NEWS: Updated with this and previous fix.
+
+2013-04-16 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1338: Remove dependence on libXp
+ * configure.ac: Drop check for libXp.
+
+2013-04-16 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/pr1319-support_giflib_5.patch,
+ Use #if not #ifdef.
+
2013-04-12 Andrew John Hughes <gnu.andrew at redhat.com>
PR1336: Bootstrap failure on Fedora 17/18
diff -r 44dda0c0c865 -r ab418eb1e664 Makefile.am
--- a/Makefile.am Sun Apr 14 21:05:17 2013 +0100
+++ b/Makefile.am Tue Apr 16 18:39:51 2013 +0100
@@ -487,7 +487,7 @@
patches/copy_memory.patch \
patches/openjdk/6718364-inference_failure.patch \
patches/openjdk/6682380-foreach_crash.patch \
- patches/openjdk/7046929-fix_t6397104_test_failure.patch
+ patches/openjdk/7046929-fix_t6397104_test_failure.patch \
patches/openjdk/7024568-long_method_resolution_oom_error.patch \
patches/openjdk/7003595-incompatibleclasschangeerror.patch \
patches/openjdk/6500343-bad_code_from_conditionals.patch
diff -r 44dda0c0c865 -r ab418eb1e664 NEWS
--- a/NEWS Sun Apr 14 21:05:17 2013 +0100
+++ b/NEWS Tue Apr 16 18:39:51 2013 +0100
@@ -24,6 +24,8 @@
- PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
- RH902004: very bad performance with E-Porto Add-In für OpenOffice Writer installed (hs23 only)
- PR1362: Fedora 19 / rawhide FTBFS SIGILL
+ - PR1338: Remove dependence on libXp
+ - PR1339: Simplify the rhino class rewriter to avoid use of concurrency
New in release 1.12.4 (2013-03-04):
diff -r 44dda0c0c865 -r ab418eb1e664 configure.ac
--- a/configure.ac Sun Apr 14 21:05:17 2013 +0100
+++ b/configure.ac Tue Apr 16 18:39:51 2013 +0100
@@ -284,16 +284,6 @@
AC_SUBST(XT_CFLAGS)
AC_SUBST(XT_LIBS)
-dnl Check for libXp headers and libraries.
-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no])
-if test "x${XP_FOUND}" = xno
-then
- AC_MSG_ERROR([Could not find Xp - \
- Try installing libXp-devel.])
-fi
-AC_SUBST(XP_CFLAGS)
-AC_SUBST(XP_LIBS)
-
dnl Check for libX11 headers and libraries.
PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
if test "x${X11_FOUND}" = xno
diff -r 44dda0c0c865 -r ab418eb1e664 patches/openjdk/7024568-long_method_resolution_oom_error.patch
--- a/patches/openjdk/7024568-long_method_resolution_oom_error.patch Sun Apr 14 21:05:17 2013 +0100
+++ b/patches/openjdk/7024568-long_method_resolution_oom_error.patch Tue Apr 16 18:39:51 2013 +0100
@@ -1,52 +1,41 @@
-# HG changeset patch
-# User mcimadamore
-# Date 1299507108 0
-# Node ID 74f0c05c51eb8e4ce08cdf8a3b8a33e36b09b5b2
-# Parent 5e6c661891da3dfbf371c1186df6cc0a77224951
-7024568: Very long method resolution causing OOM error
-Summary: Resolve.findMethod scans same receiver type more than once in certain inheritance graphs
-Reviewed-by: jjg
-Contributed-by: jan.lahoda at oracle.com
-
-diff --git a/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/share/classes/com/sun/tools/javac/comp/Resolve.java
---- openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
-@@ -45,7 +45,9 @@
+diff -Nru openjdk.orig/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
+--- openjdk.orig/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java 2013-04-16 17:29:24.789670017 +0100
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java 2013-04-16 17:36:54.208874016 +0100
+@@ -38,6 +38,10 @@
+ import static com.sun.tools.javac.code.Flags.*;
+ import static com.sun.tools.javac.code.Kinds.*;
+ import static com.sun.tools.javac.code.TypeTags.*;
++
++import java.util.Set;
++import java.util.HashSet;
++
import javax.lang.model.element.ElementVisitor;
- import java.util.Map;
-+import java.util.Set;
- import java.util.HashMap;
-+import java.util.HashSet;
-
/** Helper class for name resolution, used mostly by the attribution phase.
- *
-@@ -896,7 +898,8 @@
- bestSoFar,
+@@ -719,7 +723,8 @@
+ methodNotFound,
allowBoxing,
useVarargs,
- operator);
+ operator,
-+ new HashSet<TypeSymbol>());
++ new HashSet<TypeSymbol>());
}
// where
private Symbol findMethod(Env<AttrContext> env,
-@@ -909,11 +912,13 @@
+@@ -732,9 +737,11 @@
Symbol bestSoFar,
boolean allowBoxing,
boolean useVarargs,
- boolean operator) {
+ boolean operator,
+ Set<TypeSymbol> seen) {
- for (Type ct = intype; ct.tag == CLASS || ct.tag == TYPEVAR; ct = types.supertype(ct)) {
- while (ct.tag == TYPEVAR)
- ct = ct.getUpperBound();
+ for (Type ct = intype; ct.tag == CLASS; ct = types.supertype(ct)) {
ClassSymbol c = (ClassSymbol)ct.tsym;
+ if (!seen.add(c)) return bestSoFar;
if ((c.flags() & (ABSTRACT | INTERFACE | ENUM)) == 0)
abstractok = false;
for (Scope.Entry e = c.members().lookup(name);
-@@ -942,7 +947,7 @@
+@@ -761,7 +768,7 @@
bestSoFar = findMethod(env, site, name, argtypes,
typeargtypes,
l.head, abstractok, bestSoFar,
@@ -55,10 +44,9 @@
}
if (concrete != bestSoFar &&
concrete.kind < ERR && bestSoFar.kind < ERR &&
-diff --git a/test/tools/javac/7024568/T7024568.java b/test/tools/javac/7024568/T7024568.java
-new file mode 100644
---- /dev/null
-+++ openjdk/langtools/test/tools/javac/7024568/T7024568.java
+diff -Nru openjdk.orig/langtools/test/tools/javac/7024568/T7024568.java openjdk/langtools/test/tools/javac/7024568/T7024568.java
+--- openjdk.orig/langtools/test/tools/javac/7024568/T7024568.java 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/langtools/test/tools/javac/7024568/T7024568.java 2013-04-16 17:34:57.014990669 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
@@ -106,10 +94,9 @@
+interface C extends A, B, Test {}
+interface D extends A, B, C, Test {}
+interface E extends A, B, C, D, Test {}
-diff --git a/test/tools/javac/7024568/T7024568.out b/test/tools/javac/7024568/T7024568.out
-new file mode 100644
---- /dev/null
-+++ openjdk/langtools/test/tools/javac/7024568/T7024568.out
+diff -Nru openjdk.orig/langtools/test/tools/javac/7024568/T7024568.out openjdk/langtools/test/tools/javac/7024568/T7024568.out
+--- openjdk.orig/langtools/test/tools/javac/7024568/T7024568.out 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/langtools/test/tools/javac/7024568/T7024568.out 2013-04-16 17:34:57.014990669 +0100
@@ -0,0 +1,2 @@
+T7024568.java:32:40: compiler.err.cant.resolve.location: kindname.variable, undefined, , , (compiler.misc.location: kindname.class, Main, null)
+1 error
diff -r 44dda0c0c865 -r ab418eb1e664 patches/pr1319-support_giflib_5.patch
--- a/patches/pr1319-support_giflib_5.patch Sun Apr 14 21:05:17 2013 +0100
+++ b/patches/pr1319-support_giflib_5.patch Tue Apr 16 18:39:51 2013 +0100
@@ -12,7 +12,7 @@
int
SplashDecodeGifStream(Splash * splash, SplashStream * stream)
{
-+#ifdef GIFLIB_MAJOR >= 5
++#if GIFLIB_MAJOR >= 5
+ int error = 0;
+ GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &error);
+
diff -r 44dda0c0c865 -r ab418eb1e664 rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java Sun Apr 14 21:05:17 2013 +0100
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java Tue Apr 16 18:39:51 2013 +0100
@@ -60,8 +60,8 @@
/**
* The executor for submitting rewriting jobs.
*/
- private static final ExecutorService executor = DEBUG ?
- Executors.newSingleThreadExecutor() : Executors.newCachedThreadPool();
+ private static final ExecutorService executor =
+ Executors.newSingleThreadExecutor();
/**
* The source directory, set once by main.
@@ -290,4 +290,4 @@
return null;
}
-}
\ No newline at end of file
+}
More information about the distro-pkg-dev
mailing list