diff --git a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index e4d541a0dd22..bb4b599fbaf3 100644 --- a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -76,11 +76,18 @@ namespace { // Data package used by RenamePass() class VISIBILITY_HIDDEN RenamePassData { public: + RenamePassData() {} RenamePassData(BasicBlock *B, BasicBlock *P, const std::vector &V) : BB(B), Pred(P), Values(V) {} BasicBlock *BB; BasicBlock *Pred; std::vector Values; + + void swap(RenamePassData &RHS) { + std::swap(BB, RHS.BB); + std::swap(Pred, RHS.Pred); + Values.swap(RHS.Values); + } }; struct VISIBILITY_HIDDEN PromoteMem2Reg { @@ -406,7 +413,8 @@ void PromoteMem2Reg::run() { std::vector RenamePassWorkList; RenamePassWorkList.push_back(RenamePassData(F.begin(), 0, Values)); while(!RenamePassWorkList.empty()) { - RenamePassData RPD = RenamePassWorkList.back(); + RenamePassData RPD; + RPD.swap(RenamePassWorkList.back()); RenamePassWorkList.pop_back(); // RenamePass may add new worklist entries. RenamePass(RPD.BB, RPD.Pred, RPD.Values, RenamePassWorkList);