diff -r 000000000000 -r 9a66ca7c79fa test/tools/javac/T6358168.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/T6358168.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,113 @@
+/*
+ * 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 6358168
+ * @summary JavaCompiler.hasBeenUsed is not set in delegateCompiler
+ */
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.tools.*;
+import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.main.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.List; // disambiguate
+
+
+@SupportedAnnotationTypes("*")
+public class T6358168 extends AbstractProcessor {
+    private static String testClasses = System.getProperty("test.classes");
+    private static String testSrc = System.getProperty("test.src");
+    private static String self = T6358168.class.getName();
+
+    public static void main(String... args) throws Throwable {
+
+        JavacFileManager fm = new JavacFileManager(new Context(), false, null);
+        JavaFileObject f = fm.getFileForInput(testSrc + File.separatorChar + T6358168.class.getName() + ".java");
+
+        try {
+            // first, test case with no annotation processing
+            testNoAnnotationProcessing(fm, f);
+
+            // now, test case with annotation processing
+            testAnnotationProcessing(fm, f);
+        }
+        catch (Throwable t) {
+            AssertionError e = new AssertionError();
+            e.initCause(t);
+            throw e;
+        }
+    }
+
+    static void testNoAnnotationProcessing(JavacFileManager fm, JavaFileObject f) throws Throwable {
+        Context context = new Context();
+        fm.setContext(context);
+
+        Main compilerMain = new Main("javac", new PrintWriter(System.err, true));
+        compilerMain.setOptions(Options.instance(context));
+        compilerMain.filenames = new ListBuffer<File>();
+        compilerMain.processArgs(new String[] { "-d", "." });
+
+        JavaCompiler compiler = JavaCompiler.instance(context);
+        compiler.compile(List.of(f));
+        try {
+            compiler.compile(List.of(f));
+            throw new Error("Error: AssertionError not thrown after second call of compile");
+        } catch (AssertionError e) {
+            System.err.println("Exception from compiler (expected): " + e);
+        }
+    }
+
+    static void testAnnotationProcessing(JavacFileManager fm, JavaFileObject f) throws Throwable {
+        Context context = new Context();
+        fm.setContext(context);
+
+        Main compilerMain = new Main("javac", new PrintWriter(System.err, true));
+        compilerMain.setOptions(Options.instance(context));
+        compilerMain.filenames = new ListBuffer<File>();
+        compilerMain.processArgs(new String[] {
+                                     "-XprintRounds",
+                                     "-processorpath", testClasses,
+                                     "-processor", self,
+                                     "-d", "."});
+
+        JavaCompiler compiler = JavaCompiler.instance(context);
+        compiler.initProcessAnnotations(null);
+        JavaCompiler compiler2 = compiler.processAnnotations(compiler.enterTrees(compiler.parseFiles(List.of(f))));
+        try {
+            compiler2.compile(List.of(f));
+            throw new Error("Error: AssertionError not thrown after second call of compile");
+        } catch (AssertionError e) {
+            System.err.println("Exception from compiler (expected): " + e);
+        }
+    }
+
+    public boolean process(Set<? extends TypeElement> tes, RoundEnvironment renv) {
+        return true;
+    }
+}