refactorings

src/java.base/share/classes/java/lang/classfile/attribute/StackMapFrameInfo.java

@@ -74,12 +74,25 @@ public sealed interface StackMapFrameInfo
      * @param target the location of the frame
      * @param locals the complete list of frame locals
      * @param stack the complete frame stack
-     * @param unsetFields the complete list of unset fields
      */
     public static StackMapFrameInfo of(Label target,
             List<VerificationTypeInfo> locals,
-            List<VerificationTypeInfo> stack,
-            List<NameAndTypeEntry> unsetFields) {
+            List<VerificationTypeInfo> stack) {
+
+        return of(target, locals, stack, List.of());
+    }
+
+    /**
+     * {@return a new stack map frame}
+     * @param target the location of the frame
+     * @param locals the complete list of frame locals
+     * @param stack the complete frame stack
+     * @param unsetFields the complete list of unset fields
+     */
+    public static StackMapFrameInfo of(Label target,
+                                       List<VerificationTypeInfo> locals,
+                                       List<VerificationTypeInfo> stack,
+                                       List<NameAndTypeEntry> unsetFields) {
 
         return new StackMapDecoder.StackMapFrameImpl(255, target, locals, stack, unsetFields);
     }

src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java

@@ -597,8 +597,8 @@ private void generateStaticInitializer(ClassBuilder clb) {
                .invokespecial(cp.methodRefEntry(ncdfError, exInit))
                .athrow();
             cob.with(StackMapTableAttribute.of(List.of(
-                       StackMapFrameInfo.of(c1, classLoaderLocal, throwableStack, List.of()),
-                       StackMapFrameInfo.of(c2, classLoaderLocal, throwableStack, List.of()))));
+                       StackMapFrameInfo.of(c1, classLoaderLocal, throwableStack),
+                       StackMapFrameInfo.of(c2, classLoaderLocal, throwableStack))));
 
         });
     }
@@ -636,7 +636,6 @@ private void generateLookupAccessor(ClassBuilder clb) {
                                .with(StackMapTableAttribute.of(List.of(
                                        StackMapFrameInfo.of(failLabel,
                                                List.of(StackMapFrameInfo.ObjectVerificationTypeInfo.of(mhl)),
-                                               List.of(),
                                                List.of()))));
                         }));
     }
@@ -735,8 +734,8 @@ private void generateMethod(ClassBuilder clb) {
                                .invokespecial(uteInit)
                                .athrow()
                                .with(StackMapTableAttribute.of(List.of(
-                                    StackMapFrameInfo.of(c1, List.of(), throwableStack, List.of()),
-                                    StackMapFrameInfo.of(c2, List.of(), throwableStack, List.of()))));
+                                    StackMapFrameInfo.of(c1, List.of(), throwableStack),
+                                    StackMapFrameInfo.of(c2, List.of(), throwableStack))));
                         }
                     }));
         }

src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java

@@ -58,6 +58,7 @@ public class StackMapDecoder {
                     ASSERT_UNSET_FIELDS = 246,
                     SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247,
                     SAME_EXTENDED = 251;
+    private static final int RESERVED_TAGS_UPPER_LIMIT = ASSERT_UNSET_FIELDS; // not inclusive
     private static final StackMapFrameInfo[] NO_STACK_FRAME_INFOS = {};
 
     private final ClassReader classReader;
@@ -218,7 +219,7 @@ List<StackMapFrameInfo> entries() {
                 bci += frameType - 63;
                 stack = List.of(readVerificationTypeInfo());
             } else {
-                if (frameType < ASSERT_UNSET_FIELDS)
+                if (frameType < RESERVED_TAGS_UPPER_LIMIT)
                     throw new IllegalArgumentException("Invalid stackmap frame type: " + frameType);
                 if (frameType == ASSERT_UNSET_FIELDS) {
                     unsetFields = readEntryList(p, NameAndTypeEntry.class);
@@ -265,8 +266,7 @@ List<StackMapFrameInfo> entries() {
             entries.add(new StackMapFrameImpl(frameType,
                         label,
                         locals,
-                        stack,
-                        unsetFields));
+                        stack));
         }
         return List.copyOf(entries);
     }
@@ -348,5 +348,12 @@ public static record StackMapFrameImpl(int frameType,
             stack = List.copyOf(stack);
             unsetFields = List.copyOf(unsetFields);
         }
+
+        public StackMapFrameImpl(int frameType,
+                                 Label target,
+                                 List<VerificationTypeInfo> locals,
+                                 List<VerificationTypeInfo> stack) {
+            this(frameType, target, locals, stack, List.of());
+        }
     }
 }

src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerificationTable.java

@@ -163,6 +163,7 @@ void check_verification_type_array_size(int size, int max_size) {
                         SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247,
                         SAME_EXTENDED = 251,
                         FULL = 255;
+        private static final int RESERVED_TAGS_UPPER_LIMIT = ASSERT_UNSET_FIELDS; // not inclusive
 
         public int get_frame_count() {
             return _frame_count;
@@ -279,7 +280,7 @@ public VerificationFrame next(VerificationFrame pre_frame, boolean first, int ma
                 return frame;
             }
             int offset_delta = _stream.get_u2();
-            if (frame_type < ASSERT_UNSET_FIELDS) {
+            if (frame_type < RESERVED_TAGS_UPPER_LIMIT) {
                 _verifier.classError("reserved frame type");
             }
             if (frame_type == SAME_LOCALS_1_STACK_ITEM_EXTENDED) {