svm: fix invariant violations in the LLVM backend

Author: zapster

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java

@@ -113,6 +113,7 @@
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.lir.LIRFrameState;
 import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
 import jdk.graal.compiler.lir.LabelRef;
 import jdk.graal.compiler.lir.Variable;
 import jdk.graal.compiler.lir.VirtualStackSlot;
@@ -582,8 +583,8 @@ public AllocatableValue asAllocatable(Value value) {
 
     @Override
     public Variable emitMove(Value input) {
-        if (input instanceof LLVMVariable) {
-            return (LLVMVariable) input;
+        if (LIRValueUtil.isVariable(input) && LIRValueUtil.asVariable(input) instanceof LLVMVariable) {
+            return LIRValueUtil.asVariable(input);
         } else if (input instanceof LLVMValueWrapper) {
             return new LLVMVariable(getVal(input));
         }
@@ -619,7 +620,7 @@ public void emitMove(AllocatableValue dst, Value src) {
         } else if (LLVMIRBuilder.isWordType(destType) && LLVMIRBuilder.isObjectType(sourceType)) {
             source = builder.buildPtrToInt(source);
         }
-        ((LLVMVariable) dst).set(source);
+        ((LLVMVariable) LIRValueUtil.asVariable(dst)).set(source);
     }
 
     @Override

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java

@@ -87,6 +87,7 @@
 import jdk.graal.compiler.graph.iterators.NodeIterable;
 import jdk.graal.compiler.lir.ConstantValue;
 import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRValueUtil;
 import jdk.graal.compiler.lir.Variable;
 import jdk.graal.compiler.nodes.AbstractBeginNode;
 import jdk.graal.compiler.nodes.AbstractEndNode;
@@ -224,7 +225,8 @@ public void doBlock(HIRBlock block, StructuredGraph graph, BlockMap<List<Node>>
                         if (processedBlocks.contains(predecessor)) {
                             ValueNode phiValue = phiNode.valueAt((AbstractEndNode) predecessor.getEndNode());
                             LLVMValueRef value;
-                            if (operand(phiValue) instanceof LLVMPendingSpecialRegisterRead) {
+                            Value operand = operand(phiValue);
+                            if (LIRValueUtil.isVariable(operand) && LIRValueUtil.asVariable(operand) instanceof LLVMPendingSpecialRegisterRead) {
                                 /*
                                  * The pending read may need to perform instructions to load the
                                  * value, so we put them at the end of the predecessor block
@@ -508,7 +510,7 @@ public void emitInvoke(Invoke i) {
 
                     if (nextMemoryAccessNeedsDecompress) {
                         computedAddress = builder.buildAddrSpaceCast(computedAddress, builder.objectType(true));
-                        LLVMValueRef heapBase = ((LLVMVariable) gen.emitReadRegister(ReservedRegisters.singleton().getHeapBaseRegister(), null)).get();
+                        LLVMValueRef heapBase = ((LLVMVariable) LIRValueUtil.asVariable(gen.emitReadRegister(ReservedRegisters.singleton().getHeapBaseRegister(), null))).get();
                         computedAddress = builder.buildUncompress(computedAddress, heapBase, true, compressionShift);
                     }
 
@@ -777,14 +779,12 @@ public Value setResult(ValueNode node, Value operand) {
                 assert kind == ValueKind.Illegal.getPlatformKind();
                 llvmOperand = new LLVMVariable(builder.getUndef());
             }
-        } else if (operand instanceof LLVMAddressValue) {
-            LLVMAddressValue addressValue = (LLVMAddressValue) operand;
+        } else if (operand instanceof LLVMAddressValue addressValue) {
             Value wrappedBase = addressValue.getBase();
             Value index = addressValue.getIndex();
 
-            if (wrappedBase instanceof LLVMPendingSpecialRegisterRead) {
-                LLVMPendingSpecialRegisterRead pendingRead = (LLVMPendingSpecialRegisterRead) wrappedBase;
-                if (index != null && index != Value.ILLEGAL) {
+            if (LIRValueUtil.isVariable(wrappedBase) && LIRValueUtil.asVariable(wrappedBase) instanceof LLVMPendingSpecialRegisterRead pendingRead) {
+                if (index != null && !index.equals(Value.ILLEGAL)) {
                     pendingRead = new LLVMPendingSpecialRegisterRead(pendingRead, LLVMUtils.getVal(addressValue.getIndex()));
                 }
                 llvmOperand = pendingRead;
@@ -800,7 +800,7 @@ public Value setResult(ValueNode node, Value operand) {
                 }
 
                 LLVMValueRef intermediate;
-                if (index == null || index == Value.ILLEGAL) {
+                if (index == null || index.equals(Value.ILLEGAL)) {
                     intermediate = base;
                 } else {
                     intermediate = builder.buildGEP(base, LLVMUtils.getVal(index));

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java

@@ -39,7 +39,6 @@
 import org.graalvm.nativeimage.c.struct.CStruct;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
-import org.graalvm.word.WordFactory;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
 import com.oracle.svm.core.SubstrateOptions;
@@ -51,6 +50,7 @@
 import com.oracle.svm.hosted.code.CEntryPointCallStubSupport;
 
 import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.word.Word;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
@@ -147,7 +147,7 @@ public static ExceptionUnwind createRaiseExceptionHandler() {
             protected void customUnwindException(Pointer callerSP) {
                 _Unwind_Exception exceptionStructure = UnsafeStackValue.get(_Unwind_Exception.class);
                 exceptionStructure.set_exception_class(CurrentIsolate.getCurrentThread());
-                exceptionStructure.set_exception_cleanup(WordFactory.nullPointer());
+                exceptionStructure.set_exception_cleanup(Word.nullPointer());
                 raiseException(exceptionStructure);
             }
         };