There are a few problems with

https://github.com/openjdk/jdk/blob/37c6b23f5b82311c82f5fe981f104824f87e3e54/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
https://github.com/openjdk/jdk/blob/37c6b23f5b82311c82f5fe981f104824f87e3e54/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java

[1] rawIndexToConstantPoolIndex is used only for invokedynamic. It should be renamed to indyIndexConstantPoolIndex

[2] rawIndexToConstantPoolCacheIndex should not be called for invokedynamic bytecodes, which don't use cpCache entries after JDK-8301995.

[3] Some "cpi" parameters should be renamed to "rawIndex".