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

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

*** 168,178 ****
       * @throws IllegalStateException
       *             If a subclass calls this constructor.
       */
      public AnalyzerAdapter(final String owner, final int access,
              final String name, final String desc, final MethodVisitor mv) {
!         this(Opcodes.ASM5, owner, access, name, desc, mv);
          if (getClass() != AnalyzerAdapter.class) {
              throw new IllegalStateException();
          }
      }
  
--- 168,178 ----
       * @throws IllegalStateException
       *             If a subclass calls this constructor.
       */
      public AnalyzerAdapter(final String owner, final int access,
              final String name, final String desc, final MethodVisitor mv) {
!         this(Opcodes.ASM6, owner, access, name, desc, mv);
          if (getClass() != AnalyzerAdapter.class) {
              throw new IllegalStateException();
          }
      }
  
*** 179,189 ****
      /**
       * Creates a new {@link AnalyzerAdapter}.
       *
       * @param api
       *            the ASM API version implemented by this visitor. Must be one
!      *            of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}.
       * @param owner
       *            the owner's class name.
       * @param access
       *            the method's access flags (see {@link Opcodes}).
       * @param name
--- 179,189 ----
      /**
       * Creates a new {@link AnalyzerAdapter}.
       *
       * @param api
       *            the ASM API version implemented by this visitor. Must be one
!      *            of {@link Opcodes#ASM4}, {@link Opcodes#ASM5} or {@link Opcodes#ASM6}.
       * @param owner
       *            the owner's class name.
       * @param access
       *            the method's access flags (see {@link Opcodes}).
       * @param name
*** 688,697 ****
--- 688,699 ----
          case Opcodes.AALOAD:
              pop(1);
              t1 = pop();
              if (t1 instanceof String) {
                  pushDesc(((String) t1).substring(1));
+             } else if (t1 == Opcodes.NULL) {
+                 push(t1);
              } else {
                  push("java/lang/Object");
              }
              break;
          case Opcodes.ISTORE: