diff -r 000000000000 -r 9a66ca7c79fa test/tools/javac/implicitThis/WhichImplicitThis2.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/implicitThis/WhichImplicitThis2.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2002-2003 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 4635044 4787017
+ * @summary Invalid error when implicitly referencing enclosing type
+ *
+ * @compile WhichImplicitThis2.java
+ * @run main WhichImplicitThis2
+ */
+
+/** Check that hiding prevents enclosing class selection. */
+public class WhichImplicitThis2 {
+    boolean isX() { return false; }
+    class Middle {
+        boolean enclIsX() { return WhichImplicitThis2.this.isX(); }
+    }
+    class X extends WhichImplicitThis2 {
+        boolean isX() { return true; }
+        class Middle {} // hide WhichImplicitThis2.Middle
+        boolean check() {
+            return /*X.this.*/new WhichImplicitThis2.Middle().enclIsX();
+        }
+    }
+    public static void main(String[] args) {
+        WhichImplicitThis2 t = new WhichImplicitThis2();
+        X x = t.new X();
+        if (!x.check()) throw new Error();
+    }
+}