/hg/icedtea6: Add langtools backports suggested by Joe Darcy and...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 27 14:14:22 PDT 2013
changeset 241d297ff5e3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=241d297ff5e3
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Mar 27 21:14:08 2013 +0000
Add langtools backports suggested by Joe Darcy and backport for bundled HotSpot suggested by Xerxes.
2013-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backports (HotSpot
one only to bundled HotSpot build).
* patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch:
Backport suggested by Xerxes for hs20.
* patches/openjdk/6500343-bad_code_from_conditionals.patch,
* patches/openjdk/6682380-foreach_crash.patch,
* patches/openjdk/6718364-inference_failure.patch,
* patches/openjdk/7003595-incompatibleclasschangeerror.patch,
* patches/openjdk/7024568-long_method_resolution_oom_error.patch,
* patches/openjdk/7046929-fix_t6397104_test_failure.patch:
Langtools backports present in the proprietary JDK 6 tree,
as listed by Joe Darcy.
diffstat:
ChangeLog | 18 +-
Makefile.am | 11 +-
patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch | 32 +
patches/openjdk/6500343-bad_code_from_conditionals.patch | 129 +++
patches/openjdk/6682380-foreach_crash.patch | 97 ++
patches/openjdk/6718364-inference_failure.patch | 76 ++
patches/openjdk/7003595-incompatibleclasschangeerror.patch | 351 ++++++++++
patches/openjdk/7024568-long_method_resolution_oom_error.patch | 115 +++
patches/openjdk/7046929-fix_t6397104_test_failure.patch | 42 +
9 files changed, 868 insertions(+), 3 deletions(-)
diffs (truncated from 930 to 500 lines):
diff -r 02a65b9914d5 -r 241d297ff5e3 ChangeLog
--- a/ChangeLog Fri Mar 22 14:18:47 2013 +0000
+++ b/ChangeLog Wed Mar 27 21:14:08 2013 +0000
@@ -1,3 +1,19 @@
+2013-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backports (HotSpot
+ one only to bundled HotSpot build).
+ * patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch:
+ Backport suggested by Xerxes for hs20.
+ * patches/openjdk/6500343-bad_code_from_conditionals.patch,
+ * patches/openjdk/6682380-foreach_crash.patch,
+ * patches/openjdk/6718364-inference_failure.patch,
+ * patches/openjdk/7003595-incompatibleclasschangeerror.patch,
+ * patches/openjdk/7024568-long_method_resolution_oom_error.patch,
+ * patches/openjdk/7046929-fix_t6397104_test_failure.patch:
+ Langtools backports present in the proprietary JDK 6 tree,
+ as listed by Joe Darcy.
+
2013-03-22 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
@@ -9,7 +25,7 @@
add sun.misc.Unsafe.copyMemory method from 7.
* patches/jvmtiEnv.patch: Moved to...
* patches/hotspot/original/jvmtiEnv.patch: here.
-
+
2013-03-18 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 02a65b9914d5 -r 241d297ff5e3 Makefile.am
--- a/Makefile.am Fri Mar 22 14:18:47 2013 +0000
+++ b/Makefile.am Wed Mar 27 21:14:08 2013 +0000
@@ -478,7 +478,13 @@
patches/pr1319-support_giflib_5.patch \
patches/openjdk/8007393.patch \
patches/openjdk/8007611.patch \
- patches/copy_memory.patch
+ 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/7024568-long_method_resolution_oom_error.patch \
+ patches/openjdk/7003595-incompatibleclasschangeerror.patch \
+ patches/openjdk/6500343-bad_code_from_conditionals.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -528,7 +534,8 @@
patches/openjdk/7010849-modernise_sa.patch \
patches/hotspot/original/7197906-handle_32_bit_shifts.patch \
patches/hotspot/original/fix_get_stack_bounds_leak.patch \
- patches/hotspot/original/jvmtiEnv.patch
+ patches/hotspot/original/jvmtiEnv.patch \
+ patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch
endif
if WITH_RHINO
diff -r 02a65b9914d5 -r 241d297ff5e3 patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch Wed Mar 27 21:14:08 2013 +0000
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User coleenp
+# Date 1297874084 18000
+# Node ID c08677f982895c7e89d370768ec261c00b0d6e2d
+# Parent 5415131bc5ab69d30d14636e414d1fa400800408
+6840152: JVM crashes when heavyweight monitors are used
+Summary: Turn off biased locking if !UseFastLocking or UseHeavyMonitors options are requested.
+Reviewed-by: phh, never, dcubed, dholmes
+
+diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -3103,6 +3103,19 @@
+ // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled.
+ set_aggressive_opts_flags();
+
++ // Turn off biased locking for locking debug mode flags,
++ // which are subtlely different from each other but neither works with
++ // biased locking.
++ if (!UseFastLocking || UseHeavyMonitors) {
++ if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
++ // flag set to true on command line; warn the user that they
++ // can't enable biased locking here
++ warning("Biased Locking is not supported with locking debug flags"
++ "; ignoring UseBiasedLocking flag." );
++ }
++ UseBiasedLocking = false;
++ }
++
+ #ifdef CC_INTERP
+ // Clear flags not supported by the C++ interpreter
+ FLAG_SET_DEFAULT(ProfileInterpreter, false);
diff -r 02a65b9914d5 -r 241d297ff5e3 patches/openjdk/6500343-bad_code_from_conditionals.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6500343-bad_code_from_conditionals.patch Wed Mar 27 21:14:08 2013 +0000
@@ -0,0 +1,129 @@
+# HG changeset patch
+# User mcimadamore
+# Date 1222684483 -3600
+# Node ID ddd110646d215c6f504b1908d501ab964bf75574
+# Parent 1e83972f53fb28e27ea3ec762b8c33d0684443c1
+6500343: compiler generates bad code when translating conditional expressions
+Summary: TransTypes needs to deal with intersection types coming from conditional expressions
+Reviewed-by: jjg
+
+diff --git a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+@@ -534,7 +534,7 @@
+ tree.truepart = translate(tree.truepart, erasure(tree.type));
+ tree.falsepart = translate(tree.falsepart, erasure(tree.type));
+ tree.type = erasure(tree.type);
+- result = tree;
++ result = retype(tree, tree.type, pt);
+ }
+
+ public void visitIf(JCIf tree) {
+diff --git a/test/tools/javac/conditional/6500343/T6500343a.java b/test/tools/javac/conditional/6500343/T6500343a.java
+new file mode 100644
+--- /dev/null
++++ openjdk/langtools/test/tools/javac/conditional/6500343/T6500343a.java
+@@ -0,0 +1,50 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ * @test
++ * @bug 6500343
++ * @summary compiler generates bad code when translating conditional expressions
++ * @author Maurizio Cimadamore
++ *
++ */
++
++public class T6500343a {
++ static class Base {}
++ static interface I {}
++ static class A1 extends Base implements I {}
++ static class A2 extends Base implements I {}
++
++ static Object crash(I i, A1 a1, A2 a2, boolean b1, boolean b2) {
++ return b1 ? i : b2 ? a2 : a1;
++ // lub(I, lub(A1, A2)) ==> lub(I, Base&I) ==> I (doesn't compile on 1.4 ok >1.5)
++ }
++
++ public static void main(String[] args) {
++ T6500343a.crash(new A1(), new A1(), new A2(), true, false);
++ T6500343a.crash(new A1(), new A1(), new A2(), false, true);
++ T6500343a.crash(new A1(), new A1(), new A2(), false, false);
++ T6500343a.crash(new A1(), new A1(), new A2(), true, true);
++ }
++}
++
+diff --git a/test/tools/javac/conditional/6500343/T6500343b.java b/test/tools/javac/conditional/6500343/T6500343b.java
+new file mode 100644
+--- /dev/null
++++ openjdk/langtools/test/tools/javac/conditional/6500343/T6500343b.java
+@@ -0,0 +1,48 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ * @test
++ * @bug 6500343
++ * @summary compiler generates bad code when translating conditional expressions
++ * @author Maurizio Cimadamore
++ *
++ */
++
++public class T6500343b {
++
++ final static int i1 = 0;
++ final static int i2 = 1;
++
++ static void crash(int i) {
++ switch (i) {
++ case (true ? 0 : 1):
++ case (i1 == 5 ? 1 : 2):
++ case (i1 == i2 ? 2 : 3):
++ }
++ }
++
++ public static void main(String[] args) {
++ T6500343b.crash(0);
++ }
++}
diff -r 02a65b9914d5 -r 241d297ff5e3 patches/openjdk/6682380-foreach_crash.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6682380-foreach_crash.patch Wed Mar 27 21:14:08 2013 +0000
@@ -0,0 +1,97 @@
+# HG changeset patch
+# User mcimadamore
+# Date 1208967003 -3600
+# Node ID ec29a1a284ca0b0be1b3b44b1643e7eb6acefb69
+# Parent 627deea1ea4fba84a0e9182fbdc24110d4f5448c
+6682380: Foreach loop with generics inside finally block crashes javac with -target 1.5
+Summary: A missing type-erasure in Lower.java causes the compiler to crash since JDK6
+Reviewed-by: jjg
+
+diff --git a/src/share/classes/com/sun/tools/javac/comp/Lower.java b/src/share/classes/com/sun/tools/javac/comp/Lower.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
+@@ -2863,13 +2863,15 @@
+ JCExpressionStatement step = make.Exec(makeUnary(JCTree.PREINC, make.Ident(index)));
+
+ Type elemtype = types.elemtype(tree.expr.type);
+- JCStatement loopvarinit = make.
+- VarDef(tree.var.sym,
+- make.
+- Indexed(make.Ident(arraycache), make.Ident(index)).
+- setType(elemtype));
++ JCExpression loopvarinit = make.Indexed(make.Ident(arraycache),
++ make.Ident(index)).setType(elemtype);
++ JCVariableDecl loopvardef = (JCVariableDecl)make.VarDef(tree.var.mods,
++ tree.var.name,
++ tree.var.vartype,
++ loopvarinit).setType(tree.var.type);
++ loopvardef.sym = tree.var.sym;
+ JCBlock body = make.
+- Block(0, List.of(loopvarinit, tree.body));
++ Block(0, List.of(loopvardef, tree.body));
+
+ result = translate(make.
+ ForLoop(loopinit,
+@@ -2944,7 +2946,11 @@
+ JCExpression vardefinit = make.App(make.Select(make.Ident(itvar), next));
+ if (iteratorTarget != syms.objectType)
+ vardefinit = make.TypeCast(iteratorTarget, vardefinit);
+- JCVariableDecl indexDef = make.VarDef(tree.var.sym, vardefinit);
++ JCVariableDecl indexDef = (JCVariableDecl)make.VarDef(tree.var.mods,
++ tree.var.name,
++ tree.var.vartype,
++ vardefinit).setType(tree.var.type);
++ indexDef.sym = tree.var.sym;
+ JCBlock body = make.Block(0, List.of(indexDef, tree.body));
+ result = translate(make.
+ ForLoop(List.of(init),
+diff --git a/test/tools/javac/foreach/T6682380.java b/test/tools/javac/foreach/T6682380.java
+new file mode 100644
+--- /dev/null
++++ openjdk/langtools/test/tools/javac/foreach/T6682380.java
+@@ -0,0 +1,45 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ * @test
++ * @bug 6682380 6679509
++ * @summary Foreach loop with generics inside finally block crashes javac with -target 1.5
++ * @author Jan Lahoda, Maurizio Cimadamore
++ * @compile -target 1.5 T6682380.java
++ */
++
++import java.util.List;
++
++public class T6682380<X> {
++
++ public static void main(String[] args) {
++ try {
++ } finally {
++ List<T6682380<?>> l = null;
++ T6682380<?>[] a = null;
++ for (T6682380<?> e1 : l);
++ for (T6682380<?> e2 : a);
++ }
++ }
++}
diff -r 02a65b9914d5 -r 241d297ff5e3 patches/openjdk/6718364-inference_failure.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6718364-inference_failure.patch Wed Mar 27 21:14:08 2013 +0000
@@ -0,0 +1,76 @@
+# HG changeset patch
+# User mcimadamore
+# Date 1218213500 -3600
+# Node ID 30a415f8667f66f38aa33ad8d289048cb8d3f614
+# Parent d635feaf3747d1c3111fc84cbff603ccaa75577d
+6718364: inference fails when a generic method is invoked with raw arguments
+Summary: Bug in the implementation of Types.isSubtypeUnchecked
+Reviewed-by: jjg
+
+diff --git a/src/share/classes/com/sun/tools/javac/code/Types.java b/src/share/classes/com/sun/tools/javac/code/Types.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
+@@ -305,6 +305,11 @@
+ else if (t.tag == TYPEVAR) {
+ return isSubtypeUnchecked(t.getUpperBound(), s, warn);
+ }
++ else if (s.tag == UNDETVAR) {
++ UndetVar uv = (UndetVar)s;
++ if (uv.inst != null)
++ return isSubtypeUnchecked(t, uv.inst, warn);
++ }
+ else if (!s.isRaw()) {
+ Type t2 = asSuper(t, s.tsym);
+ if (t2 != null && t2.isRaw()) {
+diff --git a/test/tools/javac/generics/inference/6718364/T6718364.java b/test/tools/javac/generics/inference/6718364/T6718364.java
+new file mode 100644
+--- /dev/null
++++ openjdk/langtools/test/tools/javac/generics/inference/6718364/T6718364.java
+@@ -0,0 +1,38 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/**
++ * @test
++ * @bug 6718364
++ * @summary inference fails when a generic method is invoked with raw arguments
++ * @compile/ref=T6718364.out -XDstdout -XDrawDiagnostics -Xlint:unchecked T6718364.java
++ */
++class T6718364 {
++ class X<T> {}
++
++ public <T> void m(X<T> x, T t) {}
++
++ public void test() {
++ m(new X<X<Integer>>(), new X());
++ }
++}
+diff --git a/test/tools/javac/generics/inference/6718364/T6718364.out b/test/tools/javac/generics/inference/6718364/T6718364.out
+new file mode 100644
+--- /dev/null
++++ openjdk/langtools/test/tools/javac/generics/inference/6718364/T6718364.out
+@@ -0,0 +1,3 @@
++T6718364.java:36:32: compiler.warn.prob.found.req: (- compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
++T6718364.java:36:10: compiler.warn.unchecked.meth.invocation.applied: <T>m(T6718364.X<T>,T), T6718364, , T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X
++2 warnings
+\ No newline at end of file
diff -r 02a65b9914d5 -r 241d297ff5e3 patches/openjdk/7003595-incompatibleclasschangeerror.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7003595-incompatibleclasschangeerror.patch Wed Mar 27 21:14:08 2013 +0000
@@ -0,0 +1,351 @@
+# HG changeset patch
+# User dmeetry
+# Date 1325086840 -14400
+# Node ID 41a303cb946ebfadabb94e0625448bfbfe4dccc0
+# Parent 3ff13f513bc2478e05ff229fd5139989596d1850
+7003595: IncompatibleClassChangeError with unreferenced local class with subclass
+Summary: Compiler omits unreferenced local inner classes from the InnerClasses attribute
+Reviewed-by: mcimadamore
+
+diff --git a/src/share/classes/com/sun/tools/javac/code/Symbol.java b/src/share/classes/com/sun/tools/javac/code/Symbol.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
+@@ -726,6 +726,11 @@
+ */
+ public JavaFileObject classfile;
+
++ /** the list of translated local classes (used for generating
++ * InnerClasses attribute)
++ */
++ public List<ClassSymbol> trans_local;
++
+ /** the constant pool of the class
+ */
+ public Pool pool;
+diff --git a/src/share/classes/com/sun/tools/javac/comp/Lower.java b/src/share/classes/com/sun/tools/javac/comp/Lower.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
+@@ -2271,6 +2271,14 @@
+ tree.extending = translate(tree.extending);
+ tree.implementing = translate(tree.implementing);
+
++ if (currentClass.isLocal()) {
++ ClassSymbol encl = currentClass.owner.enclClass();
++ if (encl.trans_local == null) {
++ encl.trans_local = List.nil();
++ }
++ encl.trans_local = encl.trans_local.prepend(currentClass);
++ }
++
+ // Recursively translate members, taking into account that new members
+ // might be created during the translation and prepended to the member
+ // list `tree.defs'.
+diff --git a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+@@ -863,10 +863,10 @@
+ }
+ if (c.type.tag != CLASS) return; // arrays
+ if (pool != null && // pool might be null if called from xClassName
+- c.owner.kind != PCK &&
++ c.owner.enclClass() != null &&
+ (innerClasses == null || !innerClasses.contains(c))) {
+ // log.errWriter.println("enter inner " + c);//DEBUG
+- if (c.owner.kind == TYP) enterInner((ClassSymbol)c.owner);
++ enterInner(c.owner.enclClass());
+ pool.put(c);
+ pool.put(c.name);
+ if (innerClasses == null) {
+@@ -1505,6 +1505,13 @@
+ default : Assert.error();
+ }
+ }
++
++ if (c.trans_local != null) {
++ for (ClassSymbol local : c.trans_local) {
++ enterInner(local);
++ }
++ }
++
+ databuf.appendChar(fieldsCount);
+ writeFields(c.members().elems);
+ databuf.appendChar(methodsCount);
+diff --git a/test/tools/javac/7003595/T7003595.java b/test/tools/javac/7003595/T7003595.java
+new file mode 100644
+--- /dev/null
++++ openjdk/langtools/test/tools/javac/7003595/T7003595.java
+@@ -0,0 +1,233 @@
++/*
++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
More information about the distro-pkg-dev
mailing list