[GR-56344] Make all annotation processors claim their annotations

* To avoid extra annotation processing work.
oracle · Jul 25, 2024 · 3f2f41a · 3f2f41a
1 parent d81eb53
commit 3f2f41a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/...graal.compiler.processor/src/jdk/graal/compiler/lir/processor/IntrinsicStubProcessor.java b/...graal.compiler.processor/src/jdk/graal/compiler/lir/processor/IntrinsicStubProcessor.java
@@ -185,7 +185,7 @@ protected boolean doProcess(Set<? extends TypeElement> annotations, RoundEnviron
                 createStubs(this, targetVM, (TypeElement) holder, classes);
             }
         }
-        return false;
+        return true;
     }
 
     private void extractStubs(TargetVM targetVM,

diff --git a/.../jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/SyncPortProcessor.java b/.../jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/SyncPortProcessor.java
@@ -341,6 +341,6 @@ protected boolean doProcess(Set<? extends TypeElement> annotations, RoundEnviron
                 }
             }
         }
-        return false;
+        return true;
     }
 }
diff --git a/...raal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeProcessor.java b/...raal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeProcessor.java
@@ -126,7 +126,7 @@ boolean isNodeType(Element element) {
     @Override
     public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (roundEnv.processingOver()) {
-            return false;
+            return true;
         }
 
         GraphNodeVerifier verifier = new GraphNodeVerifier(this);
@@ -172,7 +172,7 @@ public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironmen
                 scope = null;
             }
         }
-        return false;
+        return true;
     }
 
     /**

diff --git a/.../src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/AbstractProcessor.java b/.../src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/AbstractProcessor.java
@@ -80,6 +80,10 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         return doProcess(annotations, roundEnv);
     }
 
+    /**
+     * Implementations should claim their annotations by returning {@code true} to avoid extra
+     * annotation processing work.
+     */
     protected abstract boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv);
 
     private final Map<String, TypeElement> types = new HashMap<>();

diff --git a/...cessor/src/jdk/graal/compiler/replacements/processor/ReplacementsAnnotationProcessor.java b/...cessor/src/jdk/graal/compiler/replacements/processor/ReplacementsAnnotationProcessor.java
@@ -67,7 +67,7 @@ public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironmen
             }
             generator.generateAll(this);
         }
-        return false;
+        return true;
     }
 
     public List<AnnotationHandler> getHandlers() {

diff --git a/...e.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/InstrumentableProcessor.java b/...e.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/InstrumentableProcessor.java
@@ -80,8 +80,7 @@
 import com.oracle.truffle.dsl.processor.java.transform.FixWarningsVisitor;
 import com.oracle.truffle.dsl.processor.java.transform.GenerateOverrideVisitor;
 
-@SupportedAnnotationTypes({
-                TruffleTypes.GenerateWrapper_Name})
+@SupportedAnnotationTypes({TruffleTypes.GenerateWrapper_Name})
 public final class InstrumentableProcessor extends AbstractProcessor {
 
     // configuration
@@ -112,7 +111,7 @@ public SourceVersion getSupportedSourceVersion() {
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (roundEnv.processingOver()) {
-            return false;
+            return true;
         }
         try (ProcessorContext context = ProcessorContext.enter(processingEnv)) {
             TruffleTypes types = context.getTypes();

diff --git a/...m.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java b/...m.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleProcessor.java
@@ -144,7 +144,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 }
             }
         }
-        return false;
+        return true;
     }
 
     private static void processElement(AnnotationProcessor<?> generator, Element e) {

diff --git a/...rocessor/src/com/oracle/truffle/dsl/processor/verify/VerifyCompilationFinalProcessor.java b/...rocessor/src/com/oracle/truffle/dsl/processor/verify/VerifyCompilationFinalProcessor.java
@@ -71,7 +71,7 @@ public SourceVersion getSupportedSourceVersion() {
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (roundEnv.processingOver()) {
-            return false;
+            return true;
         }
         try (ProcessorContext context = ProcessorContext.enter(processingEnv)) {
             TruffleTypes types = context.getTypes();
@@ -85,7 +85,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 }
                 assertNoErrorExpected(element);
             }
-            return false;
+            return true;
         }
     }
 

diff --git a/...fle.dsl.processor/src/com/oracle/truffle/dsl/processor/verify/VerifyTruffleProcessor.java b/...fle.dsl.processor/src/com/oracle/truffle/dsl/processor/verify/VerifyTruffleProcessor.java
@@ -125,7 +125,7 @@ private void reportException(Kind kind, Element element, Throwable t) {
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (roundEnv.processingOver()) {
-            return false;
+            return true;
         }
 
         try (ProcessorContext context = ProcessorContext.enter(processingEnv)) {
@@ -220,7 +220,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 }
             }
 
-            return false;
+            return true;
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             }
-            return false;
+            return true;
         }
     }