Automatic merge of jdk:master into master

Author: duke

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

@@ -400,6 +400,8 @@ private static Type cpIndexToType(int index, ConstantPoolBuilder cp) {
     }
 
     private void processMethod() {
+        var frames = this.frames;
+        var currentFrame = this.currentFrame;
         currentFrame.setLocalsFromArg(methodName, methodDesc, isStatic, thisType);
         currentFrame.stackSize = 0;
         currentFrame.flags = 0;
@@ -415,10 +417,10 @@ private void processMethod() {
                     throw generatorError("Expecting a stack map frame");
                 }
                 if (thisOffset == bcs.bci()) {
+                    Frame nextFrame = frames.get(stackmapIndex++);
                     if (!ncf) {
-                        currentFrame.checkAssignableTo(frames.get(stackmapIndex));
+                        currentFrame.checkAssignableTo(nextFrame);
                     }
-                    Frame nextFrame = frames.get(stackmapIndex++);
                     while (!nextFrame.dirty) { //skip unmatched frames
                         if (stackmapIndex == frames.size()) return; //skip the rest of this round
                         nextFrame = frames.get(stackmapIndex++);
@@ -429,7 +431,7 @@ private void processMethod() {
                     currentFrame.copyFrom(nextFrame);
                     nextFrame.dirty = false;
                 } else if (thisOffset < bcs.bci()) {
-                    throw new ClassFormatError(String.format("Bad stack map offset %d", thisOffset));
+                    throw generatorError("Bad stack map offset");
                 }
             } else if (ncf) {
                 throw generatorError("Expecting a stack map frame");