diff -r 000000000000 -r 9a66ca7c79fa test/tools/javac/api/T6258271.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/api/T6258271.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2005-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     6258271
+ * @summary DiagnosticMessage exposes internal name __input
+ * @author  Peter von der Ah\u00e9
+ */
+
+import java.io.*;
+import java.util.Arrays;
+import javax.tools.*;
+
+public class T6258271 {
+    public static void main(String... args) {
+        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
+        DiagnosticListener<JavaFileObject> dl =  new DiagnosticListener<JavaFileObject>() {
+                public void report(Diagnostic<? extends JavaFileObject> message) {
+                    JavaFileObject fo = message.getSource();
+                    if ("__input".equals(fo.toUri().getPath()))
+                        throw new AssertionError(fo);
+                    System.out.println(message);
+                }
+            };
+        StandardJavaFileManager fm = javac.getStandardFileManager(dl, null, null);
+        Iterable<? extends JavaFileObject> files =
+            fm.getJavaFileObjectsFromStrings(Arrays.asList("nofile.java"));
+        javac.getTask(null, fm, dl, null, null, files).call();
+    }
+}