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

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

*** 77,87 ****
  
      protected final Remapper remapper;
  
      public RemappingMethodAdapter(final int access, final String desc,
              final MethodVisitor mv, final Remapper remapper) {
!         this(Opcodes.ASM5, access, desc, mv, remapper);
      }
  
      protected RemappingMethodAdapter(final int api, final int access,
              final String desc, final MethodVisitor mv, final Remapper remapper) {
          super(api, access, desc, mv);
--- 77,87 ----
  
      protected final Remapper remapper;
  
      public RemappingMethodAdapter(final int access, final String desc,
              final MethodVisitor mv, final Remapper remapper) {
!         this(Opcodes.ASM6, access, desc, mv, remapper);
      }
  
      protected RemappingMethodAdapter(final int api, final int access,
              final String desc, final MethodVisitor mv, final Remapper remapper) {
          super(api, access, desc, mv);
*** 123,132 ****
--- 123,133 ----
          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);
*** 137,146 ****
--- 138,148 ----
                                  .mapType((String) t) : t;
                      } while (i < n);
                      return newEntries;
                  }
              }
+         }
          return entries;
      }
  
      @Override
      public void visitFieldInsn(int opcode, String owner, String name,