diff --git a/llvm/lib/CodeGen/MachineOutliner.cpp b/llvm/lib/CodeGen/MachineOutliner.cpp --- a/llvm/lib/CodeGen/MachineOutliner.cpp +++ b/llvm/lib/CodeGen/MachineOutliner.cpp @@ -56,6 +56,7 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/MachineOutliner.h" #include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/Statistic.h" #include "llvm/ADT/Twine.h" #include "llvm/CodeGen/MachineFunction.h" @@ -1243,28 +1244,41 @@ // Helper lambda for adding implicit def operands to the call // instruction. It also updates call site information for moved // code. - auto CopyDefsAndUpdateCalls = [&CallInst](MachineInstr &MI) { - for (MachineOperand &MOP : MI.operands()) { + SmallSet UseRegs; + MachineBasicBlock::reverse_iterator Last = + std::next(CallInst.getReverse()); + MachineBasicBlock::reverse_iterator Iter = EndIt.getReverse(); + // Copy over the defs in the outlined range. + // First inst in outlined range <-- Anything that's defined in this + // ... .. range has to be added as an + // implicit Last inst in outlined range <-- def to the call + // instruction. Also remove call site information for outlined block + // of code. The exposed uses need to be copied in the outlined range. + for (; Iter != Last; Iter++) { + MachineInstr *MI = &*Iter; + for (MachineOperand &MOP : MI->operands()) { // Skip over anything that isn't a register. if (!MOP.isReg()) continue; // If it's a def, add it to the call instruction. - if (MOP.isDef()) + if (MOP.isDef()) { CallInst->addOperand(MachineOperand::CreateReg( MOP.getReg(), true, /* isDef = true */ true /* isImp = true */)); + if (UseRegs.count(MOP.getReg())) + UseRegs.erase(MOP.getReg()); + } else if (!MOP.isUndef()) + UseRegs.insert(MOP.getReg()); } - if (MI.isCall()) - MI.getMF()->eraseCallSiteInfo(&MI); + if (MI->isCall()) + MI->getMF()->eraseCallSiteInfo(MI); }; - // Copy over the defs in the outlined range. - // First inst in outlined range <-- Anything that's defined in this - // ... .. range has to be added as an - // implicit Last inst in outlined range <-- def to the call - // instruction. Also remove call site information for outlined block - // of code. - std::for_each(CallInst, std::next(EndIt), CopyDefsAndUpdateCalls); + for (auto I : UseRegs) + // If it's a exposed use, add it to the call instruction. + CallInst->addOperand( + MachineOperand::CreateReg(I, false, /* isDef = false */ + true /* isImp = true */)); } // Erase from the point after where the call was inserted up to, and