Espresso ClassfileParser: detect jdk.internal.ValueBased

Author: gilles-duboscq

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClassfileParser.java

@@ -50,6 +50,7 @@
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_SUPER;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_SYNCHRONIZED;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_SYNTHETIC;
+import static com.oracle.truffle.espresso.classfile.Constants.ACC_VALUE_BASED;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_VARARGS;
 import static com.oracle.truffle.espresso.classfile.Constants.ACC_VOLATILE;
 import static com.oracle.truffle.espresso.classfile.Constants.JVM_RECOGNIZED_CLASS_MODIFIERS;
@@ -893,7 +894,7 @@ RuntimeVisibleAnnotationsAttribute parseRuntimeVisibleAnnotations(int attributeS
                 flags = switch (location) {
                     case Method -> parseMethodVMAnnotations(subStream);
                     case Field -> parseFieldVMAnnotations(subStream);
-                    case Class -> 0;
+                    case Class -> parseClassVMAnnotations(subStream);
                 };
             }
 
@@ -943,6 +944,20 @@ private int parseFieldVMAnnotations(ClassfileStream subStream) {
             }
             return flags;
         }
+
+        private int parseClassVMAnnotations(ClassfileStream subStream) {
+            int flags = 0;
+            int count = subStream.readU2();
+            for (int j = 0; j < count; j++) {
+                int typeIndex = parseAnnotation(subStream);
+                // Validation of the type is done at runtime by guest java code.
+                Symbol<?> annotType = pool.utf8At(typeIndex, "annotation type");
+                if (ParserTypes.jdk_internal_ValueBased.equals(annotType)) {
+                    flags |= ACC_VALUE_BASED;
+                }
+            }
+            return flags;
+        }
     }
 
     @SuppressWarnings("unchecked")
@@ -1248,6 +1263,10 @@ private Attribute[] parseClassAttributes() throws ValidationException {
                         throw classFormatError("Duplicate PermittedSubclasses attribute");
                     }
                     classAttributes[i] = permittedSubclasses = parsePermittedSubclasses(attributeName);
+                } else if (attributeName.equals(ParserNames.RuntimeVisibleAnnotations)) {
+                    RuntimeVisibleAnnotationsAttribute annotations = commonAttributeParser.parseRuntimeVisibleAnnotations(attributeSize, AnnotationLocation.Class);
+                    classFlags |= annotations.flags;
+                    classAttributes[i] = annotations.attribute;
                 } else {
                     Attribute attr = commonAttributeParser.parseCommonAttribute(attributeName, attributeSize);
                     // stream.skip(attributeSize);

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/Constants.java

@@ -53,15 +53,16 @@ public final class Constants {
 
     // Not part of the spec, used internally by the VM.
     // Methods
-    public static final int ACC_FINALIZER            = 0x00010000;
     public static final int ACC_FORCE_INLINE         = 0x00020000;
     public static final int ACC_LAMBDA_FORM_COMPILED = 0x00040000;
     public static final int ACC_CALLER_SENSITIVE     = 0x00080000;
     public static final int ACC_HIDDEN               = 0x00100000; // also for fields
     public static final int ACC_SCOPED               = 0x00200000;
     public static final int ACC_DONT_INLINE          = 0x00400000;
     // Classes
+    public static final int ACC_FINALIZER            = 0x00010000;
     public static final int ACC_IS_HIDDEN_CLASS      = 0x04000000; // synchronized with JVM_ACC_IS_HIDDEN_CLASS
+    public static final int ACC_VALUE_BASED          = 0x00020000;
     // Fields
     public static final int ACC_STABLE               = 0x00010000;
 

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/descriptors/ParserSymbols.java

@@ -75,6 +75,7 @@ public static final class ParserTypes {
         public static final Symbol<Type> jdk_internal_vm_annotation_ForceInline = SYMBOLS.putType("Ljdk/internal/vm/annotation/ForceInline;");
         public static final Symbol<Type> java_lang_invoke_DontInline = SYMBOLS.putType("Ljava/lang/invoke/DontInline;");
         public static final Symbol<Type> jdk_internal_vm_annotation_DontInline = SYMBOLS.putType("Ljdk/internal/vm/annotation/DontInline;");
+        public static final Symbol<Type> jdk_internal_ValueBased = SYMBOLS.putType("Ljdk/internal/ValueBased;");
 
         // ScopedMemoryAccess
         public static final Symbol<Type> jdk_internal_misc_ScopedMemoryAccess$Scoped = SYMBOLS.putType("Ljdk/internal/misc/ScopedMemoryAccess$Scoped;");