src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java

rev 47452 : imported patch jdk-new-asmv6.patch

@@ -74,11 +74,11 @@
 public class MethodRemapper extends MethodVisitor {
 
     protected final Remapper remapper;
 
     public MethodRemapper(final MethodVisitor mv, final Remapper remapper) {
-        this(Opcodes.ASM5, mv, remapper);
+        this(Opcodes.ASM6, mv, remapper);
     }
 
     protected MethodRemapper(final int api, final MethodVisitor mv,
             final Remapper remapper) {
         super(api, mv);

@@ -120,10 +120,11 @@
         super.visitFrame(type, nLocal, remapEntries(nLocal, local), nStack,
                 remapEntries(nStack, stack));
     }
 
     private Object[] remapEntries(int n, Object[] entries) {
+        if (entries != null) {
         for (int i = 0; i < n; i++) {
             if (entries[i] instanceof String) {
                 Object[] newEntries = new Object[n];
                 if (i > 0) {
                     System.arraycopy(entries, 0, newEntries, 0, i);

@@ -134,10 +135,11 @@
                             .mapType((String) t) : t;
                 } while (i < n);
                 return newEntries;
             }
         }
+        }
         return entries;
     }
 
     @Override
     public void visitFieldInsn(int opcode, String owner, String name,