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

*** 91,101 ****
--- 91,107 ----
      /**
       * The descriptor of the field or method designated by this handle.
       */
      final String desc;
  
+     
      /**
+      * Indicate if the owner is an interface or not.
+      */
+     final boolean itf;
+ 
+     /**
       * Constructs a new field or method handle.
       *
       * @param tag
       *            the kind of field or method designated by this Handle. Must be
       *            {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC},
*** 111,126 ****
--- 117,164 ----
       * @param name
       *            the name of the field or method designated by this handle.
       * @param desc
       *            the descriptor of the field or method designated by this
       *            handle.
+      *
+      * @deprecated this constructor has been superseded
+      *             by {@link #Handle(int, String, String, String, boolean)}.
       */
+     @Deprecated
      public Handle(int tag, String owner, String name, String desc) {
+         this(tag, owner, name, desc, tag == Opcodes.H_INVOKEINTERFACE);
+     }
+ 
+     /**
+      * Constructs a new field or method handle.
+      *
+      * @param tag
+      *            the kind of field or method designated by 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 class that owns the field or method
+      *            designated by this handle.
+      * @param name
+      *            the name of the field or method designated by this handle.
+      * @param desc
+      *            the descriptor of the field or method designated by this
+      *            handle.
+      * @param itf
+      *            true if the owner is an interface.
+      */
+     public Handle(int tag, String owner, String name, String desc, boolean itf) {
          this.tag = tag;
          this.owner = owner;
          this.name = name;
          this.desc = desc;
+         this.itf = itf;
      }
  
      /**
       * Returns the kind of field or method designated by this handle.
       *
*** 162,199 ****
       */
      public String getDesc() {
          return desc;
      }
  
      @Override
      public boolean equals(Object obj) {
          if (obj == this) {
              return true;
          }
          if (!(obj instanceof Handle)) {
              return false;
          }
          Handle h = (Handle) obj;
!         return tag == h.tag && owner.equals(h.owner) && name.equals(h.name)
!                 && desc.equals(h.desc);
      }
  
      @Override
      public int hashCode() {
!         return tag + owner.hashCode() * name.hashCode() * desc.hashCode();
      }
  
      /**
       * Returns the textual representation of this handle. The textual
       * representation is:
       *
       * <pre>
       * owner '.' name desc ' ' '(' tag ')'
       * </pre>
       *
       * . As this format is unambiguous, it can be parsed if necessary.
       */
      @Override
      public String toString() {
!         return owner + '.' + name + desc + " (" + tag + ')';
      }
  }
--- 200,251 ----
       */
      public String getDesc() {
          return desc;
      }
  
+     /**
+      * Returns true if the owner of the field or method designated
+      * by this handle is an interface.
+      *
+      * @return true if the owner of the field or method designated
+      *         by this handle is an interface.
+      */
+     public boolean isInterface() {
+         return itf;
+     }
+ 
      @Override
      public boolean equals(Object obj) {
          if (obj == this) {
              return true;
          }
          if (!(obj instanceof Handle)) {
              return false;
          }
          Handle h = (Handle) obj;
!         return tag == h.tag && itf == h.itf && owner.equals(h.owner)
!                 && name.equals(h.name) && desc.equals(h.desc);
      }
  
      @Override
      public int hashCode() {
!         return tag + (itf? 64: 0) + owner.hashCode() * name.hashCode() * desc.hashCode();
      }
  
      /**
       * Returns the textual representation of this handle. The textual
       * representation is:
       *
       * <pre>
+      * for a reference to a class:
       * owner '.' name desc ' ' '(' tag ')'
+      * for a reference to an interface:
+      * owner '.' name desc ' ' '(' tag ' ' itf ')'
       * </pre>
       *
       * . As this format is unambiguous, it can be parsed if necessary.
       */
      @Override
      public String toString() {
!         return owner + '.' + name + desc + " (" + tag + (itf? " itf": "") + ')';
      }
  }