src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java

*** 267,283 ****
  
    public static boolean isInvokedynamicIndex(int i) { return (i < 0); }
  
    public static int  decodeInvokedynamicIndex(int i) { Assert.that(isInvokedynamicIndex(i),  ""); return ~i; }
  
!   // The invokedynamic points at the object index.  The object map points at
!   // the cpCache index and the cpCache entry points at the original constant
!   // pool index.
    public int invokedynamicCPCacheIndex(int index) {
      Assert.that(isInvokedynamicIndex(index), "should be a invokedynamic index");
!     int rawIndex = decodeInvokedynamicIndex(index);
!     return referenceMap().at(rawIndex);
    }
  
    ConstantPoolCacheEntry invokedynamicCPCacheEntryAt(int index) {
      // decode index that invokedynamic points to.
      int cpCacheIndex = invokedynamicCPCacheIndex(index);
--- 267,282 ----
  
    public static boolean isInvokedynamicIndex(int i) { return (i < 0); }
  
    public static int  decodeInvokedynamicIndex(int i) { Assert.that(isInvokedynamicIndex(i),  ""); return ~i; }
  
!   // The invokedynamic points at a CP cache entry.  This entry points back
!   // at the original CP entry (CONSTANT_InvokeDynamic) and also (via f2) at an entry
!   // in the resolved_references array (which provides the appendix argument).
    public int invokedynamicCPCacheIndex(int index) {
      Assert.that(isInvokedynamicIndex(index), "should be a invokedynamic index");
!     return decodeInvokedynamicIndex(index);
    }
  
    ConstantPoolCacheEntry invokedynamicCPCacheEntryAt(int index) {
      // decode index that invokedynamic points to.
      int cpCacheIndex = invokedynamicCPCacheIndex(index);