Clearly mark which AST nodes are unsupported in ReflectMethods

Reviewed-by: psandoz

Author: mcimadamore

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ReflectMethods.java

@@ -431,31 +431,36 @@ class BodyScanner extends FilterScanner {
         private Type bodyTarget;
         private JCTree currentNode;
 
-        // Only few AST nodes supported for now
-        private static final Set<JCTree.Tag> SUPPORTED_TAGS =
-                Set.of(Tag.VARDEF,
-                        Tag.RETURN, Tag.THROW, Tag.BREAK, Tag.CONTINUE,
-                        Tag.PLUS, Tag.MINUS, Tag.MUL, Tag.DIV, Tag.MOD,
-                        Tag.NEG, Tag.NOT,
-                        Tag.BITOR, Tag.BITAND, Tag.BITXOR,
-                        Tag.BITOR_ASG, Tag.BITAND_ASG, Tag.BITXOR_ASG,
-                        Tag.SL, Tag.SR, Tag.USR,
-                        Tag.SL_ASG, Tag.SR_ASG, Tag.USR_ASG,
-                        Tag.PLUS_ASG, Tag.MINUS_ASG, Tag.MUL_ASG, Tag.DIV_ASG, Tag.MOD_ASG,
-                        Tag.POSTINC, Tag.PREINC, Tag.POSTDEC, Tag.PREDEC,
-                        Tag.EQ, Tag.NE, Tag.LT, Tag.LE, Tag.GT, Tag.GE,
-                        Tag.AND, Tag.OR,
-                        Tag.LITERAL, Tag.IDENT, Tag.TYPEIDENT, Tag.ASSIGN, Tag.EXEC, Tag.PARENS,
-                        Tag.SELECT, Tag.INDEXED, Tag.APPLY,
-                        Tag.TYPECAST, Tag.TYPETEST,
-                        Tag.NEWCLASS, Tag.NEWARRAY, Tag.LAMBDA, Tag.REFERENCE,
-                        Tag.BLOCK, Tag.IF, Tag.WHILELOOP, Tag.DOLOOP, Tag.FOREACHLOOP, Tag.FORLOOP, Tag.TRY,
-                        Tag.SWITCH_EXPRESSION, Tag.YIELD,
-                        Tag.CONDEXPR,
-                        Tag.ASSERT,
-                        Tag.LABELLED,
-                        Tag.SKIP,
-                        Tag.TYPEARRAY);
+        // unsupported tree nodes
+        private static final EnumSet<JCTree.Tag> UNSUPPORTED_TAGS = EnumSet.of(
+                // statements
+                Tag.SWITCH, Tag.SYNCHRONIZED,
+                // operators
+                Tag.COMPL, Tag.POS,
+
+                // the nodes below are not as relevant, either because they have already
+                // been handled by an earlier compiler pass, or because they are typically
+                // not handled directly, but in the context of some enclosing statement.
+
+                // modifiers (these are already turned into symbols by Attr and should not be dealt with directly)
+                Tag.ANNOTATION, Tag.TYPE_ANNOTATION, Tag.MODIFIERS,
+                // toplevel (likely outside the scope for code models)
+                Tag.TOPLEVEL, Tag.PACKAGEDEF, Tag.IMPORT, Tag.CLASSDEF, Tag.METHODDEF,
+                // modules (likely outside the scope for code models)
+                Tag.MODULEDEF, Tag.EXPORTS, Tag.OPENS, Tag.PROVIDES, Tag.REQUIRES, Tag.USES,
+                // switch labels (these are handled by the encloising construct, SWITCH or SWITCH_EXPRESSION)
+                Tag.CASE, Tag.DEFAULTCASELABEL, Tag.CONSTANTCASELABEL, Tag.PATTERNCASELABEL,
+                // patterns (these are handled by the enclosing construct, like IF, SWITCH_EXPRESSION, TYPETEST)
+                Tag.ANYPATTERN, Tag.BINDINGPATTERN, Tag.RECORDPATTERN,
+                // catch (already handled as part of TRY)
+                Tag.CATCH,
+                // types (these are used to parse types and should not be dealt with directly)
+                Tag.TYPEAPPLY, Tag.TYPEUNION, Tag.TYPEINTERSECTION, Tag.TYPEPARAMETER, Tag.WILDCARD,
+                Tag.TYPEBOUNDKIND, Tag.ANNOTATED_TYPE,
+                // internal (these are synthetic nodes generated by javac)
+                Tag.NO_TAG, Tag.ERRONEOUS, Tag.NULLCHK, Tag.LETEXPR);
+
+        private static final Set<JCTree.Tag> SUPPORTED_TAGS = EnumSet.complementOf(UNSUPPORTED_TAGS);
 
         BodyScanner(JCMethodDecl tree) {
             this(tree, tree.body);