changeset 1890:35a325f9c83e

8009227: Certain diagnostics should not be deferred
author mcimadamore
date Thu, 28 Feb 2013 15:54:08 +0000
parents 992e484da75e
children ad2c34f28c8b
files src/share/classes/com/sun/tools/javac/comp/Check.java src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java src/share/classes/com/sun/tools/javac/util/Log.java test/tools/javac/diags/examples.not-yet.txt test/tools/javac/lambda/abort/CompletionFailure.java
diffstat 6 files changed, 145 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed Feb 27 19:56:00 2013 +0000
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Feb 28 15:54:08 2013 +0000
@@ -285,7 +285,7 @@
      *  @param ex         The failure to report.
      */
     public Type completionError(DiagnosticPosition pos, CompletionFailure ex) {
-        log.error(pos, "cant.access", ex.sym, ex.getDetailValue());
+        log.error(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE, pos, "cant.access", ex.sym, ex.getDetailValue());
         if (ex instanceof ClassReader.BadClassFile
                 && !suppressAbortOnBadClassFile) throw new Abort();
         else return syms.errType;
--- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Wed Feb 27 19:56:00 2013 +0000
+++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Thu Feb 28 15:54:08 2013 +0000
@@ -303,11 +303,6 @@
             attr.attribTree(newTree, speculativeEnv, resultInfo);
             unenterScanner.scan(newTree);
             return newTree;
-        } catch (Abort ex) {
-            //if some very bad condition occurred during deferred attribution
-            //we should dump all errors before killing javac
-            deferredDiagnosticHandler.reportDeferredDiagnostics();
-            throw ex;
         } finally {
             unenterScanner.scan(newTree);
             log.popDiagnosticHandler(deferredDiagnosticHandler);
--- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Wed Feb 27 19:56:00 2013 +0000
+++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Thu Feb 28 15:54:08 2013 +0000
@@ -347,7 +347,8 @@
         MANDATORY,
         RESOLVE_ERROR,
         SYNTAX,
-        RECOVERABLE
+        RECOVERABLE,
+        NON_DEFERRABLE,
     }
 
     private final DiagnosticType type;
--- a/src/share/classes/com/sun/tools/javac/util/Log.java	Wed Feb 27 19:56:00 2013 +0000
+++ b/src/share/classes/com/sun/tools/javac/util/Log.java	Thu Feb 28 15:54:08 2013 +0000
@@ -136,10 +136,12 @@
         }
 
         public void report(JCDiagnostic diag) {
-            if (filter == null || filter.accepts(diag))
+            if (!diag.isFlagSet(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE) &&
+                (filter == null || filter.accepts(diag))) {
                 deferred.add(diag);
-            else
+            } else {
                 prev.report(diag);
+            }
         }
 
         public Queue<JCDiagnostic> getDiagnostics() {
--- a/test/tools/javac/diags/examples.not-yet.txt	Wed Feb 27 19:56:00 2013 +0000
+++ b/test/tools/javac/diags/examples.not-yet.txt	Thu Feb 28 15:54:08 2013 +0000
@@ -113,3 +113,4 @@
 compiler.misc.incompatible.arg.types.in.mref                                     #LAMBDA
 compiler.misc.static.method.in.unbound.lookup                                    #LAMBDA
 compiler.misc.bad.arg.types.in.lambda                                            #LAMBDA
+compiler.misc.not.def.public.cant.access                                         #LAMBDA
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/abort/CompletionFailure.java	Thu Feb 28 15:54:08 2013 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8009227
+ * @summary Certain diagnostics should not be deferred
+ */
+
+import com.sun.source.util.JavacTask;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Arrays;
+import javax.tools.Diagnostic;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class CompletionFailure {
+
+    public static void main(String... args) throws Exception {
+
+        String SCRATCH_DIR = System.getProperty("user.dir");
+        JavaCompiler javacTool = ToolProvider.getSystemJavaCompiler();
+        File scratchDir = new File(SCRATCH_DIR);
+
+        sourceA.dumpTo(scratchDir);
+        sourceB.dumpTo(scratchDir);
+        
+        JavacTask ct = (JavacTask)javacTool.getTask(null, null, null,
+                null, null, Arrays.asList(sourceA.asJFO(scratchDir), sourceB.asJFO(scratchDir)));
+        
+        ct.generate();
+        
+        remove(scratchDir, "A.java");
+        remove(scratchDir, "B.java");
+        remove(scratchDir, "A.class");
+        
+        sourceC.dumpTo(scratchDir);
+        sourceD.dumpTo(scratchDir);
+
+        DiagnosticChecker diagChecker = new DiagnosticChecker();
+        ct = (JavacTask)javacTool.getTask(null, null, diagChecker,
+                Arrays.asList("-XDrawDiagnostics", "-cp", scratchDir.getAbsolutePath()),
+                null, Arrays.asList(sourceC.asJFO(scratchDir), sourceD.asJFO(scratchDir)));
+        try {
+            ct.analyze();
+        } catch (Throwable ex) {
+            //ignore abort exception thrown by javac
+        }
+
+        if (!diagChecker.errorFound) {
+            throw new AssertionError("Missing diagnostic");
+        }
+    }
+    
+    static void remove(File dir, String fileName) {
+        File fileToRemove = new File(dir, fileName);
+        fileToRemove.delete();
+    }
+
+    static class JavaSource {
+        String contents;
+        String filename;
+
+        public JavaSource(String filename, String contents) {
+            this.filename =  filename;
+            this.contents = contents;
+        }
+
+        void dumpTo(java.io.File loc) throws Exception {
+            File file = new File(loc, filename);
+            BufferedWriter bw = new java.io.BufferedWriter(new FileWriter(file));
+            bw.append(contents);
+            bw.close();
+        }
+
+        SimpleJavaFileObject asJFO(java.io.File dir) {
+            return new SimpleJavaFileObject(new File(dir, filename).toURI(), JavaFileObject.Kind.SOURCE) {
+                @Override
+                public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                    return contents;
+                }
+            };
+        }
+    }
+    
+    static JavaSource sourceA = new JavaSource("A.java", "public interface A { }\n");
+    
+    static JavaSource sourceB = new JavaSource("B.java", "public class B implements A {\n" +
+                                               "   public static Object n() { return null; }\n" +
+                                               "}\n");
+
+    static JavaSource sourceC = new JavaSource("C.java", "public class C {\n" +
+                                               "   void test(B b) {\n" +
+                                               "      D.m(B.n());\n" +
+                                               "}  }\n");
+    
+    static JavaSource sourceD = new JavaSource("D.java", "public class D {\n" +
+                                               "   static void m(Object o) { }\n" +
+                                               "}\n");
+
+    static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
+
+        boolean errorFound;
+
+        public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR &&
+                    diagnostic.getCode().contains("compiler.err.cant.access")) {
+                errorFound = true;
+            }
+        }
+    }
+}