Merge rust-lang#21

21: Add a `YkMt*` first argument to control points. r=vext01 a=ltratt



Co-authored-by: Laurence Tratt <[email protected]>

Author: bors[bot]

llvm/lib/Transforms/Yk/ControlPoint.cpp

@@ -7,9 +7,11 @@
 // The pass converts an interpreter loop that looks like this:
 //
 // ```
+// YkMT *mt = ...;
+// YkLocation loc = ...;
 // pc = 0;
 // while (...) {
-//     yk_control_point(); // <- dummy control point
+//     yk_control_point(mt, loc); // <- dummy control point
 //     bc = program[pc];
 //     switch (bc) {
 //         // bytecode handlers here.
@@ -32,7 +34,7 @@
 // while (...) {
 //     // Now we call the patched control point.
 //     cp_vars.pc = pc;
-//     yk_new_control_point(&cp_vars);
+//     __ykrt__control_point(mt, loc, &cp_vars);
 //     pc = cp_vars.pc;
 //     bc = program[pc];
 //     switch (bc) {
@@ -59,6 +61,13 @@
 #define DEBUG_TYPE "yk-control-point"
 #define JIT_STATE_PREFIX "jit-state: "
 
+#define YK_OLD_CONTROL_POINT_NUM_ARGS 2
+
+#define YK_CONTROL_POINT_ARG_MT_IDX 0
+#define YK_CONTROL_POINT_ARG_LOC_IDX 1
+#define YK_CONTROL_POINT_ARG_VARS_IDX 2
+#define YK_CONTROL_POINT_NUM_ARGS 3
+
 using namespace llvm;
 
 /// Find the call to the dummy control point that we want to patch.
@@ -156,11 +165,16 @@ class YkControlPoint : public ModulePass {
     StructType *CtrlPointVarsTy =
         StructType::create(TypeParams, "YkCtrlPointVars");
 
+    // The old control point should be of the form:
+    //    control_point(YkMT*, YkLocation*)
+    assert(OldCtrlPointCall->arg_size() == YK_OLD_CONTROL_POINT_NUM_ARGS);
+    Type *YkMTTy = OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_MT_IDX)->getType();
+    Type *YkLocTy = OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_LOC_IDX)->getType();
+
     // Create the new control point.
-    Type *YkLocTy = OldCtrlPointCall->getArgOperand(0)->getType();
     FunctionType *FType =
         FunctionType::get(Type::getVoidTy(Context),
-                          {YkLocTy, CtrlPointVarsTy->getPointerTo()}, false);
+                          {YkMTTy, YkLocTy, CtrlPointVarsTy->getPointerTo()}, false);
     Function *NF = Function::Create(FType, GlobalVariable::ExternalLinkage,
                                     YK_NEW_CONTROL_POINT, M);
 
@@ -183,7 +197,11 @@ class YkControlPoint : public ModulePass {
 
     // Insert call to the new control point.
     Instruction *NewCtrlPointCallInst = Builder.CreateCall(
-        NF, {OldCtrlPointCall->getArgOperand(0), InputStruct});
+        NF, {
+          OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_MT_IDX),
+          OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_LOC_IDX),
+          InputStruct
+        });
 
     // Once the control point returns we need to extract the (potentially
     // mutated) values from the returned YkCtrlPointStruct and reassign them to