Fix invalid slow-path call on fast-path.

charygao · Oct 11, 2019 · c8e8b96 · c8e8b96
1 parent 740e20b
commit c8e8b96
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...fle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/rust/LLVMStart.java b/...fle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/rust/LLVMStart.java
@@ -34,6 +34,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
+import com.oracle.truffle.api.dsl.CachedLanguage;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.llvm.runtime.LLVMContext;
@@ -99,10 +100,11 @@ protected LangStartVtableType createLangStartVtable(Type vtableType) {
         @SuppressWarnings("unused")
         protected long doOp(StackPointer stackPointer, LLVMNativePointer mainPointer, LLVMNativePointer vtable, long argc, LLVMPointer argv,
                         @CachedContext(LLVMLanguage.class) LLVMContext ctx,
+                        @CachedLanguage LLVMLanguage language,
                         @Cached("createToNativeWithTarget()") LLVMToNativeNode toNative,
                         @Cached("createClosureDispatchNode()") LLVMClosureDispatchNode fnDispatchNode,
                         @Cached("createClosureDispatchNode()") LLVMClosureDispatchNode dropInPlaceDispatchNode) {
-            LLVMMemory memory = getLLVMMemory();
+            LLVMMemory memory = language.getCapability(LLVMMemory.class);
             LLVMGlobal vtableGlobal = ctx.findGlobal(vtable);
             LangStartVtableType langStartVtable = createLangStartVtable(vtableGlobal.getPointeeType());
             LLVMNativePointer fn = readFn(memory, vtable, langStartVtable);