Box the result of a nested constant dynamic if the expected type is n…

…ot a primitive
oracle · May 27, 2024 · 0464752 · 0464752
1 parent 86fa5f6
commit 0464752
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java b/...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java
@@ -1153,7 +1153,12 @@ protected Object resolveLinkedObject(int bci, int cpi, int opcode, BootstrapMeth
                         int argCpi = primitiveConstant.asInt();
                         Object argConstant = loadConstantDynamic(argCpi, opcode == Opcodes.INVOKEDYNAMIC ? Opcodes.LDC : opcode);
                         if (argConstant instanceof ValueNode valueNode) {
-                            currentNode = valueNode;
+                            ResolvedJavaMethod.Parameter[] parameters = bootstrapMethod.getParameters();
+                            if (valueNode.getStackKind().isPrimitive() && i + 3 <= parameters.length && !parameters[i + 3].getKind().isPrimitive()) {
+                                currentNode = append(BoxNode.create(valueNode, getMetaAccess().lookupJavaType(valueNode.getStackKind().toBoxedJavaClass()), valueNode.getStackKind()));
+                            } else {
+                                currentNode = valueNode;
+                            }
                         } else if (argConstant instanceof Throwable || argConstant instanceof UnresolvedJavaType) {
                             /* A nested constant dynamic threw. */
                             return argConstant;