Skip to content

Commit 4e1fb0b

Browse files
committed
svm: migrate SharedGraphBuilderPhase to ClassFile API
1 parent a63c18b commit 4e1fb0b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static com.oracle.svm.core.SubstrateUtil.toUnboxedClass;
2828
import static jdk.graal.compiler.bytecode.Bytecodes.LDC2_W;
2929

30+
import java.lang.classfile.Opcode;
3031
import java.lang.constant.ConstantDescs;
3132
import java.lang.invoke.LambdaConversionException;
3233
import java.lang.invoke.MethodHandles;
@@ -79,7 +80,6 @@
7980
import com.oracle.svm.hosted.code.SubstrateCompilationDirectives;
8081
import com.oracle.svm.hosted.nodes.DeoptProxyNode;
8182
import com.oracle.svm.hosted.substitute.SubstitutionType;
82-
import com.oracle.svm.shaded.org.objectweb.asm.Opcodes;
8383
import com.oracle.svm.util.ReflectionUtil;
8484

8585
import jdk.graal.compiler.api.replacements.Fold;
@@ -1548,7 +1548,7 @@ protected Object resolveLinkedObject(int bci, int cpi, int opcode, BootstrapMeth
15481548
ValueNode currentNode;
15491549
if (constant instanceof PrimitiveConstant primitiveConstant) {
15501550
int argCpi = primitiveConstant.asInt();
1551-
Object argConstant = loadConstantDynamic(argCpi, opcode == Opcodes.INVOKEDYNAMIC ? Opcodes.LDC : opcode);
1551+
Object argConstant = loadConstantDynamic(argCpi, opcode == Opcode.INVOKEDYNAMIC.bytecode() ? Opcode.LDC.bytecode() : opcode);
15521552
if (argConstant instanceof ValueNode valueNode) {
15531553
ResolvedJavaMethod.Parameter[] parameters = bootstrapMethod.getParameters();
15541554
if (valueNode.getStackKind().isPrimitive() && i + 3 <= parameters.length && !parameters[i + 3].getKind().isPrimitive()) {

0 commit comments

Comments
 (0)