Merge rust-lang#26

26: Mark function arguments live for the control point. r=ltratt a=vext01



Co-authored-by: Edd Barrett <[email protected]>

Author: bors[bot]

llvm/lib/Transforms/Yk/ControlPoint.cpp

@@ -89,9 +89,19 @@ CallInst *findControlPointCall(Module &M) {
 }
 
 /// Extract all live variables that need to be passed into the control point.
+///
+/// YKFIXME: This currently computes an over-approximation of what's live.
+/// https://github.com/ykjit/yk/issues/515
 std::vector<Value *> getLiveVars(DominatorTree &DT, CallInst *OldCtrlPoint) {
   std::vector<Value *> Vec;
   Function *Func = OldCtrlPoint->getFunction();
+
+  // Add function arguments to the live set.
+  for (Value &Arg : Func->args()) {
+    Vec.push_back(&Arg);
+  }
+
+  // Then add anything which dominates the control point to the live set.
   for (auto &BB : *Func) {
     if (!DT.dominates(cast<Instruction>(OldCtrlPoint), &BB)) {
       for (auto &I : BB) {