jdk-sandbox: comparison langtools/test/tools/javac/failover/CheckAttributedTree.java

equal deleted inserted replaced

-:5ce1fe94b270
+:a09fedde76be
 /*
-* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2010, 2014, 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.
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import javax.lang.model.element.Element;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
 import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.util.JavacTask;
 import com.sun.source.util.TaskEvent;
-import com.sun.source.util.JavacTask;
 import com.sun.source.util.TaskListener;
+import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCImport;
 import com.sun.tools.javac.tree.TreeInfo;
 } catch (IOException e) {
 error("Error reading " + file + ": " + e);
 }
 }
 });
+return;
 }
 if (!quiet)
 error("File " + file + " ignored");
 }
 /**
 * Read a file.
 * @param file the file to be read
 * @return the tree for the content of the file
 * @throws IOException if any IO errors occur
-* @throws TreePosTest.ParseException if any errors occur while parsing the file
+* @throws AttributionException if any errors occur while analyzing the file
 */
 List<Pair<JCCompilationUnit, JCTree>> read(File file) throws IOException, AttributionException {
 r.errors = 0;
 Iterable<? extends JavaFileObject> files = fm.get().getJavaFileObjects(file);
 String[] opts = { "-XDshouldStopPolicy=ATTR", "-XDverboseCompilePolicy" };
 JavacTask task = (JavacTask)comp.getTask(pw, fm.get(), r, Arrays.asList(opts), null, files);
 final List<Element> analyzedElems = new ArrayList<>();
 task.setTaskListener(new TaskListener() {
 public void started(TaskEvent e) {
 if (e.getKind() == TaskEvent.Kind.ANALYZE)
 analyzedElems.add(e.getTypeElement());
 }
 public void finished(TaskEvent e) { }
 });
 try {
 Iterable<? extends CompilationUnitTree> trees = task.parse();
-task.analyze();
+//            JavaCompiler c = JavaCompiler.instance(((JavacTaskImpl) task).getContext());
+//            System.err.println("verboseCompilePolicy: " + c.verboseCompilePolicy);
+//            System.err.println("shouldStopIfError: " + c.shouldStopPolicyIfError);
+//            System.err.println("shouldStopIfNoError: " + c.shouldStopPolicyIfNoError);
+Iterable<? extends Element> elems = task.analyze();
+if (!elems.iterator().hasNext())
+throw new AttributionException("No results from analyze");
 List<Pair<JCCompilationUnit, JCTree>> res = new ArrayList<>();
-//System.out.println("Try to add pairs. Elems are " + analyzedElems);
+//System.err.println("Try to add pairs. Elems are " + analyzedElems);
 for (CompilationUnitTree t : trees) {
 JCCompilationUnit cu = (JCCompilationUnit)t;
 for (JCTree def : cu.defs) {
 if (def.hasTag(CLASSDEF) &&
 analyzedElems.contains(((JCTree.JCClassDecl)def).sym)) {
-//System.out.println("Adding pair...");
+//System.err.println("Adding pair..." + cu.sourcefile + " " + ((JCTree.JCClassDecl) def).name);
 res.add(new Pair<>(cu, def));
 }
 }
 }
 return res;
 * Report an error. When the program is complete, the program will either
 * exit or throw an Error if any errors have been reported.
 * @param msg the error message
 */
 void error(String msg) {
+System.err.println();
 System.err.println(msg);
+System.err.println();
 errCount.incrementAndGet();
 }
 /** Flag: don't report irrelevant files. */
 boolean quiet;
 * left uninitialized after attribution
 */
 private class NPETester extends TreeScanner {
 void test(List<Pair<JCCompilationUnit, JCTree>> trees) {
 for (Pair<JCCompilationUnit, JCTree> p : trees) {
+//              System.err.println("checking " + p.fst.sourcefile);
 sourcefile = p.fst.sourcefile;
 endPosTable = p.fst.endPositions;
 encl = new Info(p.snd, endPosTable);
 p.snd.accept(this);
 }
 Info self = new Info(tree, endPosTable);
 if (mandatoryType(tree)) {
 check(tree.type != null,
 "'null' field 'type' found in tree ", self);
 if (tree.type==null)
-new Throwable().printStackTrace();
+Thread.dumpStack();
 }
 Field errField = checkFields(tree);
 if (errField!=null) {
 check(false,

changeset 26264	a09fedde76be
parent 15385	ee1eebe7e210
child 29776	984a79b71cfe