# HG changeset patch
# User mcimadamore
# Date 1207749457 -3600
# Node ID 53e498fa5c0e4dfa355e443c3f90ccbe81a5d818
# Parent  b3b5eadd2bca161d3eef6c28889467cdce6394c9
6657499: javac 1.6.0 fails to compile class with inner class
Summary: Lookup of member inner classes silently fails leading to an unwanted erasure to take place
Reviewed-by: jjg

diff -r b3b5eadd2bca -r 53e498fa5c0e langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Apr 09 14:45:50 2008 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Apr 09 14:57:37 2008 +0100
@@ -1810,7 +1810,7 @@
             chk.earlyRefError(tree.pos(), sym.kind == VAR ? sym : thisSym(tree.pos(), env));
         }
         Env<AttrContext> env1 = env;
-        if (sym.kind != ERR && sym.owner != null && sym.owner != env1.enclClass.sym) {
+        if (sym.kind != ERR && sym.kind != TYP && sym.owner != null && sym.owner != env1.enclClass.sym) {
             // If the found symbol is inaccessible, then it is
             // accessed through an enclosing instance.  Locate this
             // enclosing instance:
diff -r b3b5eadd2bca -r 53e498fa5c0e langtools/test/tools/javac/generics/T6657499.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/T6657499.java	Wed Apr 09 14:57:37 2008 +0100
@@ -0,0 +1,44 @@
+/*
+ * 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 6657499
+ * @summary generics: javac 1.6.0 fails to compile class with inner class
+ * @author Maurizio Cimadamore
+ *
+ */
+
+public class T6657499<T> {
+    T t;
+    public T test() {
+        class Local {private T t;};
+        class Local2 {T m() {return t;}};
+        T t3 = new Local().t;
+        return new Local2().m();
+    }
+    public static void main(String[] args) {
+        String s = new T6657499<String>().test();
+    }
+}