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

*** 1079,1089 ****
              } else { // s == primitive type or array
                  return newClassItem(t.getDescriptor());
              }
          } else if (cst instanceof Handle) {
              Handle h = (Handle) cst;
!             return newHandleItem(h.tag, h.owner, h.name, h.desc);
          } else {
              throw new IllegalArgumentException("value " + cst);
          }
      }
  
--- 1079,1089 ----
              } else { // s == primitive type or array
                  return newClassItem(t.getDescriptor());
              }
          } else if (cst instanceof Handle) {
              Handle h = (Handle) cst;
!             return newHandleItem(h.tag, h.owner, h.name, h.desc, h.itf);
          } else {
              throw new IllegalArgumentException("value " + cst);
          }
      }
  
*** 1214,1237 ****
       *            the internal name of the field or method owner class.
       * @param name
       *            the name of the field or method.
       * @param desc
       *            the descriptor of the field or method.
       * @return a new or an already existing method type reference item.
       */
      Item newHandleItem(final int tag, final String owner, final String name,
!             final String desc) {
          key4.set(HANDLE_BASE + tag, owner, name, desc);
          Item result = get(key4);
          if (result == null) {
              if (tag <= Opcodes.H_PUTSTATIC) {
                  put112(HANDLE, tag, newField(owner, name, desc));
              } else {
                  put112(HANDLE,
                          tag,
!                         newMethod(owner, name, desc,
!                                 tag == Opcodes.H_INVOKEINTERFACE));
              }
              result = new Item(index++, key4);
              put(result);
          }
          return result;
--- 1214,1238 ----
       *            the internal name of the field or method owner class.
       * @param name
       *            the name of the field or method.
       * @param desc
       *            the descriptor of the field or method.
+      * @param itf
+      *            true if the owner is an interface.
       * @return a new or an already existing method type reference item.
       */
      Item newHandleItem(final int tag, final String owner, final String name,
!             final String desc, final boolean itf) {
          key4.set(HANDLE_BASE + tag, owner, name, desc);
          Item result = get(key4);
          if (result == null) {
              if (tag <= Opcodes.H_PUTSTATIC) {
                  put112(HANDLE, tag, newField(owner, name, desc));
              } else {
                  put112(HANDLE,
                          tag,
!                         newMethod(owner, name, desc, itf));
              }
              result = new Item(index++, key4);
              put(result);
          }
          return result;
*** 1257,1273 ****
       *            the name of the field or method.
       * @param desc
       *            the descriptor of the field or method.
       * @return the index of a new or already existing method type reference
       *         item.
       */
      public int newHandle(final int tag, final String owner, final String name,
              final String desc) {
!         return newHandleItem(tag, owner, name, desc).index;
      }
  
      /**
       * Adds an invokedynamic reference to the constant pool of the class being
       * build. Does nothing if the constant pool already contains a similar item.
       * <i>This method is intended for {@link Attribute} sub classes, and is
       * normally not needed by class generators or adapters.</i>
       *
--- 1258,1308 ----
       *            the name of the field or method.
       * @param desc
       *            the descriptor of the field or method.
       * @return the index of a new or already existing method type reference
       *         item.
+      *
+      * @deprecated this method is superseded by
+      *             {@link #newHandle(int, String, String, String, boolean)}.
       */
+     @Deprecated
      public int newHandle(final int tag, final String owner, final String name,
              final String desc) {
!         return newHandle(tag, owner, name, desc, tag == Opcodes.H_INVOKEINTERFACE);
      }
  
      /**
+      * Adds a handle to the constant pool of the class being build. Does nothing
+      * if the constant pool already contains a similar item. <i>This method is
+      * intended for {@link Attribute} sub classes, and is normally not needed by
+      * class generators or adapters.</i>
+      *
+      * @param tag
+      *            the kind of this handle. Must be {@link Opcodes#H_GETFIELD},
+      *            {@link Opcodes#H_GETSTATIC}, {@link Opcodes#H_PUTFIELD},
+      *            {@link Opcodes#H_PUTSTATIC}, {@link Opcodes#H_INVOKEVIRTUAL},
+      *            {@link Opcodes#H_INVOKESTATIC},
+      *            {@link Opcodes#H_INVOKESPECIAL},
+      *            {@link Opcodes#H_NEWINVOKESPECIAL} or
+      *            {@link Opcodes#H_INVOKEINTERFACE}.
+      * @param owner
+      *            the internal name of the field or method owner class.
+      * @param name
+      *            the name of the field or method.
+      * @param desc
+      *            the descriptor of the field or method.
+      * @param itf
+      *            true if the owner is an interface.
+      * @return the index of a new or already existing method type reference
+      *         item.
+      */
+     public int newHandle(final int tag, final String owner, final String name,
+             final String desc, final boolean itf) {
+         return newHandleItem(tag, owner, name, desc, itf).index;
+     }
+ 
+     /**
       * Adds an invokedynamic reference to the constant pool of the class being
       * build. Does nothing if the constant pool already contains a similar item.
       * <i>This method is intended for {@link Attribute} sub classes, and is
       * normally not needed by class generators or adapters.</i>
       *
*** 1292,1302 ****
  
          int position = bootstrapMethods.length; // record current position
  
          int hashCode = bsm.hashCode();
          bootstrapMethods.putShort(newHandle(bsm.tag, bsm.owner, bsm.name,
!                 bsm.desc));
  
          int argsLength = bsmArgs.length;
          bootstrapMethods.putShort(argsLength);
  
          for (int i = 0; i < argsLength; i++) {
--- 1327,1337 ----
  
          int position = bootstrapMethods.length; // record current position
  
          int hashCode = bsm.hashCode();
          bootstrapMethods.putShort(newHandle(bsm.tag, bsm.owner, bsm.name,
!                 bsm.desc, bsm.isInterface()));
  
          int argsLength = bsmArgs.length;
          bootstrapMethods.putShort(argsLength);
  
          for (int i = 0; i < argsLength; i++) {