archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6973626: test/tools/javac/processing/* tests fail with assertions enabled

Browse source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2010-08-02 16:29:54 -07:00
parent 74210780a0
commit 0c1962f5de
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
View file

@ -900,11 +900,11 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
/** Run a processing round. */ /** Run a processing round. */
void run(boolean lastRound, boolean errorStatus) { void run(boolean lastRound, boolean errorStatus) {
assert lastRound // assert lastRound
? (topLevelClasses.size() == 0 && annotationsPresent.size() == 0) // ? (topLevelClasses.size() == 0 && annotationsPresent.size() == 0)
: (errorStatus == false); // : (errorStatus == false);
//
printRoundInfo(topLevelClasses, annotationsPresent, lastRound); // printRoundInfo(topLevelClasses, annotationsPresent, lastRound);
TaskListener taskListener = context.get(TaskListener.class); TaskListener taskListener = context.get(TaskListener.class);
if (taskListener != null) if (taskListener != null)
@ -912,6 +912,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
try { try {
if (lastRound) { if (lastRound) {
printRoundInfo(List.<ClassSymbol>nil(), Collections.<TypeElement>emptySet(), lastRound);
filer.setLastRound(true); filer.setLastRound(true);
Set<Element> emptyRootElements = Collections.emptySet(); // immutable Set<Element> emptyRootElements = Collections.emptySet(); // immutable
RoundEnvironment renv = new JavacRoundEnvironment(true, RoundEnvironment renv = new JavacRoundEnvironment(true,
@ -920,6 +921,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
JavacProcessingEnvironment.this); JavacProcessingEnvironment.this);
discoveredProcs.iterator().runContributingProcs(renv); discoveredProcs.iterator().runContributingProcs(renv);
} else { } else {
printRoundInfo(topLevelClasses, annotationsPresent, lastRound);
discoverAndRunProcs(context, annotationsPresent, topLevelClasses, packageInfoFiles); discoverAndRunProcs(context, annotationsPresent, topLevelClasses, packageInfoFiles);
} }
} finally { } finally {
@ -947,7 +949,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
boolean lastRound) { boolean lastRound) {
if (printRounds || verbose) { if (printRounds || verbose) {
log.printNoteLines("x.print.rounds", log.printNoteLines("x.print.rounds",
number, (!lastRound ? number : number + 1),
"{" + topLevelClasses.toString(", ") + "}", "{" + topLevelClasses.toString(", ") + "}",
annotationsPresent, annotationsPresent,
lastRound); lastRound);