Skip to content

8314249: Refactor handling of invokedynamic in JVMCI ConstantPool #15297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

8314249: Refactor handling of invokedynamic in JVMCI ConstantPool #15297

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bee008c
8314249: Refactor handling of invokedynamic in JVMCI ConstantPool
iklam Aug 15, 2023
e50483a
Added docs about the names we use for indices: cpi, rawIndex, cpci an…
iklam Aug 15, 2023
30020de
fixed comments
iklam Aug 15, 2023
5b09aed
added test case for ConstantPool.lookupAppendix; other code touch by …
iklam Aug 15, 2023
2c05936
fixed test
iklam Aug 15, 2023
337895c
fixed whitespace
iklam Aug 15, 2023
e09f65f
@dougxc comments - fixed typos
iklam Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ int constantPoolRemapInstructionOperandFromCache(HotSpotConstantPool constantPoo
/**
* Gets the appendix object (if any) associated with the entry identified by {@code which}.
*
* @param which if negative, is treated as an encoded indy index for INVONEDYNAMIC;
* @param which if negative, is treated as an encoded indy index for INVOKEDYNAMIC;
* Otherwise, it's treated as a constant pool cache index (returned by HotSpotConstantPool::rawIndexToConstantPoolCacheIndex)
* for INVOKE{VIRTUAL,SPECIAL,STATIC,INTERFACE}.
*/
Expand Down
3 changes: 2 additions & 1 deletion src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
* <li>which - May be either a {@code rawIndex} or a {@code cpci}.</li>
* </ul>
*
* Note that {@code cpci} and {@code which} are used only in the HotSpot-specific implementation. They are not used by the public iterface in jdk.vm.ci.meta.*.
* Note that {@code cpci} and {@code which} are used only in the HotSpot-specific implementation. They
* are not used by the public interface in jdk.vm.ci.meta.*.
* After JDK-8301993, all uses of {@code cpci} and {@code which} will be replaced with {@code rawIndex}.
*/
public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleObject {
Expand Down
6 changes: 3 additions & 3 deletions src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ interface BootstrapMethodInvocation {
* in the constant pool.
*
* @param index if {@code opcode} is -1, {@code index} is a constant pool index. Otherwise {@code opcode}
* must be ${code Bytecodes.INVOKEDYNAMIC}, and {@code index} must be the operand of that
* opcode in the bytecode stream (i.e., a {$code rawIndex}).
* @param opcode must be ${code Bytecodes.INVOKEDYNAMIC}, or -1 if
* must be {@code Bytecodes.INVOKEDYNAMIC}, and {@code index} must be the operand of that
* opcode in the bytecode stream (i.e., a {@code rawIndex}).
* @param opcode must be {@code Bytecodes.INVOKEDYNAMIC}, or -1 if
* {@code index} was not decoded from a bytecode stream
* @return the bootstrap method invocation details or {@code null} if the entry specified by {@code index}
* is not a {@code CONSTANT_Dynamic_info} or @{code CONSTANT_InvokeDynamic_info}
Expand Down