diff -r 000000000000 -r 9a66ca7c79fa test/tools/javac/6402516/CheckMethod.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/6402516/CheckMethod.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2006 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 6402516
+ * @summary need Trees.getScope(TreePath)
+ * @build Checker CheckMethod
+ * @run main CheckMethod
+ */
+
+import java.util.*;
+import com.sun.source.tree.*;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+
+/*
+ * Check the enclosing method of a scope against the contents of string literals.
+ */
+public class CheckMethod extends Checker {
+    public static void main(String... args) throws Exception {
+        Checker chk = new CheckMethod();
+        chk.check("TestMethod.java");
+    }
+
+    @Override
+    protected boolean checkLocal(Scope s, String ref) {
+        //System.err.println("checkLocal: " + s + " " + ref + " " + s.getEnclosingMethod());
+        ExecutableElement ee = s.getEnclosingMethod();
+        boolean ok;
+        if (ee == null)
+            ok = ref.equals("0");
+        else {
+            CharSequence name = ee.getSimpleName();
+            ok = ref.equals(name == null || name.length() == 0 ? "-" : name.toString());
+        }
+        if (!ok)
+            error(s, ref, "bad enclosing method found: " + ee);
+        return ok;
+    }
+}