Skip to content

Commit 61faa52

Browse files
committed
[GR-56344] Make all annotation processors claim their annotations
PullRequest: graal/18434
2 parents 0def9d9 + 3f2f41a commit 61faa52

File tree

9 files changed

+16
-13
lines changed

9 files changed

+16
-13
lines changed

compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/IntrinsicStubProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ protected boolean doProcess(Set<? extends TypeElement> annotations, RoundEnviron
185185
createStubs(this, targetVM, (TypeElement) holder, classes);
186186
}
187187
}
188-
return false;
188+
return true;
189189
}
190190

191191
private void extractStubs(TargetVM targetVM,

compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/SyncPortProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,6 @@ protected boolean doProcess(Set<? extends TypeElement> annotations, RoundEnviron
341341
}
342342
}
343343
}
344-
return false;
344+
return true;
345345
}
346346
}

compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ boolean isNodeType(Element element) {
126126
@Override
127127
public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
128128
if (roundEnv.processingOver()) {
129-
return false;
129+
return true;
130130
}
131131

132132
GraphNodeVerifier verifier = new GraphNodeVerifier(this);
@@ -172,7 +172,7 @@ public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironmen
172172
scope = null;
173173
}
174174
}
175-
return false;
175+
return true;
176176
}
177177

178178
/**

compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/AbstractProcessor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
8080
return doProcess(annotations, roundEnv);
8181
}
8282

83+
/**
84+
* Implementations should claim their annotations by returning {@code true} to avoid extra
85+
* annotation processing work.
86+
*/
8387
protected abstract boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv);
8488

8589
private final Map<String, TypeElement> types = new HashMap<>();

compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/ReplacementsAnnotationProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironmen
6767
}
6868
generator.generateAll(this);
6969
}
70-
return false;
70+
return true;
7171
}
7272

7373
public List<AnnotationHandler> getHandlers() {

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/InstrumentableProcessor.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
import com.oracle.truffle.dsl.processor.java.transform.FixWarningsVisitor;
8181
import com.oracle.truffle.dsl.processor.java.transform.GenerateOverrideVisitor;
8282

83-
@SupportedAnnotationTypes({
84-
TruffleTypes.GenerateWrapper_Name})
83+
@SupportedAnnotationTypes({TruffleTypes.GenerateWrapper_Name})
8584
public final class InstrumentableProcessor extends AbstractProcessor {
8685

8786
// configuration
@@ -112,7 +111,7 @@ public SourceVersion getSupportedSourceVersion() {
112111
@Override
113112
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
114113
if (roundEnv.processingOver()) {
115-
return false;
114+
return true;
116115
}
117116
try (ProcessorContext context = ProcessorContext.enter(processingEnv)) {
118117
TruffleTypes types = context.getTypes();

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
144144
}
145145
}
146146
}
147-
return false;
147+
return true;
148148
}
149149

150150
private static void processElement(AnnotationProcessor<?> generator, Element e) {

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/verify/VerifyCompilationFinalProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public SourceVersion getSupportedSourceVersion() {
7171
@Override
7272
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
7373
if (roundEnv.processingOver()) {
74-
return false;
74+
return true;
7575
}
7676
try (ProcessorContext context = ProcessorContext.enter(processingEnv)) {
7777
TruffleTypes types = context.getTypes();
@@ -85,7 +85,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
8585
}
8686
assertNoErrorExpected(element);
8787
}
88-
return false;
88+
return true;
8989
}
9090
}
9191

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/verify/VerifyTruffleProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private void reportException(Kind kind, Element element, Throwable t) {
125125
@Override
126126
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
127127
if (roundEnv.processingOver()) {
128-
return false;
128+
return true;
129129
}
130130

131131
try (ProcessorContext context = ProcessorContext.enter(processingEnv)) {
@@ -220,7 +220,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
220220
}
221221
}
222222

223-
return false;
223+
return true;
224224
}
225225
}
226226

0 commit comments

Comments
 (0)