Let the processor handle RubyBaseNode in addition to RubyNode

Author: eregon

src/processor/java/org/truffleruby/processor/CoreModuleChecks.java

@@ -33,11 +33,10 @@ static void checks(
             CoreMethod coreMethod,
             TypeElement klass,
             boolean hasZeroArgument) {
-
         byte[] lowerArgs = null;
 
         TypeElement klassIt = klass;
-        while (true) {
+        while (!coreModuleProcessor.isNodeBaseType(klassIt)) {
             for (Element el : klassIt.getEnclosedElements()) {
                 if (!(el instanceof ExecutableElement)) {
                     continue; // we are interested only in executable elements
@@ -65,11 +64,6 @@ static void checks(
                     .getProcessingEnvironment()
                     .getElementUtils()
                     .getTypeElement(klassIt.getSuperclass().toString());
-            if (coreModuleProcessor.getProcessingEnvironment().getTypeUtils().isSameType(
-                    klassIt.asType(),
-                    coreModuleProcessor.rubyNodeType)) {
-                break;
-            }
         }
 
         if (lowerArgs == null) {

src/processor/java/org/truffleruby/processor/CoreModuleProcessor.java

@@ -95,6 +95,7 @@ ProcessingEnvironment getProcessingEnvironment() {
     TypeMirror virtualFrameType;
     TypeMirror objectType;
     TypeMirror rubyNodeType;
+    TypeMirror rubyBaseNodeType;
 
     @Override
     public SourceVersion getSupportedSourceVersion() {
@@ -115,6 +116,10 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                 .getElementUtils()
                 .getTypeElement("org.truffleruby.language.RubyNode")
                 .asType();
+        rubyBaseNodeType = processingEnv
+                .getElementUtils()
+                .getTypeElement("org.truffleruby.language.RubyBaseNode")
+                .asType();
 
         if (!annotations.isEmpty()) {
             for (Element element : roundEnvironment.getElementsAnnotatedWith(CoreModule.class)) {
@@ -403,7 +408,7 @@ private List<String> getArgumentNamesFromSpecializations(TypeElement klass, bool
         List<VariableElement> argumentElements = new ArrayList<>();
 
         TypeElement klassIt = klass;
-        while (true) {
+        while (!isNodeBaseType(klassIt)) {
             for (Element el : klassIt.getEnclosedElements()) {
                 if (!(el instanceof ExecutableElement)) {
                     continue; // we are interested only in executable elements
@@ -462,14 +467,16 @@ private List<String> getArgumentNamesFromSpecializations(TypeElement klass, bool
             }
 
             klassIt = processingEnv.getElementUtils().getTypeElement(klassIt.getSuperclass().toString());
-            if (processingEnv.getTypeUtils().isSameType(klassIt.asType(), rubyNodeType)) {
-                break;
-            }
         }
 
         return argumentNames;
     }
 
+    public boolean isNodeBaseType(TypeElement typeElement) {
+        return processingEnv.getTypeUtils().isSameType(typeElement.asType(), rubyNodeType) ||
+                processingEnv.getTypeUtils().isSameType(typeElement.asType(), rubyBaseNodeType);
+    }
+
     private boolean anyCoreMethod(List<? extends Element> enclosedElements) {
         for (Element e : enclosedElements) {
             if (e instanceof TypeElement && e.getAnnotation(CoreMethod.class) != null) {