Skip to content

8315771: [JVMCI] Resolution of bootstrap methods with int[] static arguments #15588

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 13 commits into from
Closed

8315771: [JVMCI] Resolution of bootstrap methods with int[] static arguments #15588

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0940de
Implement lookup of bootstrap methods with static arguments of type i…
Zeavee Sep 6, 2023
2cdc0b4
Rewrite doc for bootstrapArgumentIndexAt and add second argument to a…
Zeavee Sep 6, 2023
b33ffed
Add more details to the documentation and add a pseudo code example f…
Zeavee Sep 7, 2023
093d0ce
Add missing line of pseudo code and applied modification suggestion
Zeavee Sep 7, 2023
4ec0a7b
Add CachedBSMArgs to resolve arguments lazily instead of letting the …
Zeavee Sep 7, 2023
079969c
Fix BootstrapMethodInvocation.getStaticArguments documentation and ad…
Zeavee Sep 8, 2023
d6aa593
Use lookupConstant instead of lookupConstantInPool in CachedBSMArgs.get
Zeavee Sep 13, 2023
d75e092
Add undefined behavior documentation for bootstrapArgumentIndexAt and…
Zeavee Sep 13, 2023
f4377fc
Update getStaticArguments documentation example and update TestDynami…
Zeavee Sep 14, 2023
9e0627a
Add -XX:UseBootstrapCallInfo=3 to TestDynamicConstant
Zeavee Sep 19, 2023
ea4aa98
Add an extra run configuration for TestDynamicConstant instead of rep…
Zeavee Sep 19, 2023
7c27481
Update BootstrapMethodInvocation.getStaticArguments documentation
Zeavee Sep 20, 2023
7a8d9f2
Iterate over all static arguments in TestDynamicConstant
Zeavee Sep 21, 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
40 changes: 28 additions & 12 deletions ...compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,21 +392,29 @@ private void testLookupBootstrapMethodInvocation(CondyType condyType, MetaAccess
Assert.assertTrue(expectedBSMs.contains(bsm), expectedBSMs.toString());
} else {
Assert.assertFalse(bsmi.isInvokeDynamic());
if (condyType == CondyType.CALL_DIRECT_BSM || condyType == CondyType.CALL_DIRECT_WITH_ARGS_BSM) {
Assert.assertTrue(bsm.startsWith("jdk.vm.ci.hotspot.test.TestDynamicConstant.get") && bsm.endsWith("BSM"), bsm);
if (condyType == CondyType.CALL_DIRECT_WITH_ARGS_BSM) {
List<JavaConstant> staticArguments = bsmi.getStaticArguments();
if (staticArguments.size() > 0) {
JavaConstant primitiveConstant = staticArguments.get(0);
Assert.assertTrue(primitiveConstant instanceof PrimitiveConstant);
BootstrapMethodInvocation innerBsmi = cp.lookupBootstrapMethodInvocation(primitiveConstant.asInt(), -1);
checkBsmName(condyType, bsm);
List<JavaConstant> staticArguments = bsmi.getStaticArguments();
for (int i = 0; i < staticArguments.size(); ++i) {
JavaConstant constant = staticArguments.get(i);
if (constant instanceof PrimitiveConstant) {
String innerTag = String.valueOf(getTagAt.invoke(cp, constant.asInt()));
if (condyType == CondyType.CALL_DIRECT_WITH_ARGS_BSM) {
Assert.assertEquals(i, 0);
Assert.assertEquals(innerTag, "Dynamic");
}
if (innerTag.equals("Dynamic")) {
BootstrapMethodInvocation innerBsmi = cp.lookupBootstrapMethodInvocation(constant.asInt(), -1);
String innerBsm = innerBsmi.getMethod().format("%H.%n");
Assert.assertTrue(innerBsm.startsWith("jdk.vm.ci.hotspot.test.TestDynamicConstant.get") && bsm.endsWith("BSM"), bsm);
Assert.assertTrue(staticArguments.get(1) instanceof HotSpotObjectConstant);
checkBsmName(condyType, innerBsm);
} else {
Assert.assertEquals(innerTag, "MethodHandle");
}
} else {
if (condyType == CondyType.CALL_DIRECT_WITH_ARGS_BSM) {
Assert.assertEquals(i, 1);
}
Assert.assertTrue(staticArguments.get(i) instanceof HotSpotObjectConstant);
}
} else {
Assert.assertEquals(bsm, "java.lang.invoke.ConstantBootstraps.invoke");
}
}
} else {
Expand All @@ -417,6 +425,14 @@ private void testLookupBootstrapMethodInvocation(CondyType condyType, MetaAccess
testLoadReferencedType(concat, cp);
}

private static void checkBsmName(CondyType condyType, String bsm) {
if (condyType == CondyType.CALL_DIRECT_BSM || condyType == CondyType.CALL_DIRECT_WITH_ARGS_BSM) {
Assert.assertTrue(bsm.startsWith("jdk.vm.ci.hotspot.test.TestDynamicConstant.get") && bsm.endsWith("BSM"), bsm);
} else {
Assert.assertEquals(bsm, "java.lang.invoke.ConstantBootstraps.invoke");
}
}

private static int beS4(byte[] data, int bci) {
return (data[bci] << 24) | ((data[bci + 1] & 0xff) << 16) | ((data[bci + 2] & 0xff) << 8) | (data[bci + 3] & 0xff);
}
Expand Down