Index: lib/Transforms/Utils/PromoteMemoryToRegister.cpp =================================================================== --- lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -168,13 +168,15 @@ class RenamePassData { public: using ValVector = std::vector; + using LocationVector = std::vector; - RenamePassData(BasicBlock *B, BasicBlock *P, ValVector V) - : BB(B), Pred(P), Values(std::move(V)) {} + RenamePassData(BasicBlock *B, BasicBlock *P, ValVector V, LocationVector L) + : BB(B), Pred(P), Values(std::move(V)), Locations(std::move(L)) {} BasicBlock *BB; BasicBlock *Pred; ValVector Values; + LocationVector Locations; }; /// \brief This assigns and keeps a per-bb relative ordering of load/store @@ -303,6 +305,7 @@ SmallPtrSetImpl &LiveInBlocks); void RenamePass(BasicBlock *BB, BasicBlock *Pred, RenamePassData::ValVector &IncVals, + RenamePassData::LocationVector &IncLocs, std::vector &Worklist); bool QueuePhiNode(BasicBlock *BB, unsigned AllocaIdx, unsigned &Version); }; @@ -653,15 +656,20 @@ for (unsigned i = 0, e = Allocas.size(); i != e; ++i) Values[i] = UndefValue::get(Allocas[i]->getAllocatedType()); + // When handling debug info, treat all incoming values as if they have unknown + // locations until proven otherwise. + RenamePassData::LocationVector Locations(Allocas.size()); + // Walks all basic blocks in the function performing the SSA rename algorithm // and inserting the phi nodes we marked as necessary std::vector RenamePassWorkList; - RenamePassWorkList.emplace_back(&F.front(), nullptr, std::move(Values)); + RenamePassWorkList.emplace_back(&F.front(), nullptr, std::move(Values), + std::move(Locations)); do { RenamePassData RPD = std::move(RenamePassWorkList.back()); RenamePassWorkList.pop_back(); // RenamePass may add new worklist entries. - RenamePass(RPD.BB, RPD.Pred, RPD.Values, RenamePassWorkList); + RenamePass(RPD.BB, RPD.Pred, RPD.Values, RPD.Locations, RenamePassWorkList); } while (!RenamePassWorkList.empty()); // The renamer uses the Visited set to avoid infinite loops. Clear it now. @@ -868,6 +876,16 @@ return true; } +/// Update the debug location of a phi. \p ApplyMergedLoc indicates whether to +/// create a merged location incorporating \p DL, or to set \p DL directly. +static void updateForIncomingValueLocation(PHINode *PN, DebugLoc DL, + bool ApplyMergedLoc) { + if (ApplyMergedLoc) + PN->applyMergedLocation(PN->getDebugLoc(), DL); + else + PN->setDebugLoc(DL); +} + /// \brief Recursively traverse the CFG of the function, renaming loads and /// stores to the allocas which we are promoting. /// @@ -875,6 +893,7 @@ /// predecessor block Pred. void PromoteMem2Reg::RenamePass(BasicBlock *BB, BasicBlock *Pred, RenamePassData::ValVector &IncomingVals, + RenamePassData::LocationVector &IncomingLocs, std::vector &Worklist) { NextIteration: // If we are inserting any phi nodes into this BB, they will already be in the @@ -899,6 +918,10 @@ do { unsigned AllocaNo = PhiToAllocaMap[APN]; + // Update the location of the phi node. + updateForIncomingValueLocation(APN, IncomingLocs[AllocaNo], + APN->getNumIncomingValues() > 0); + // Add N incoming values to the PHI node. for (unsigned i = 0; i != NumEdges; ++i) APN->addIncoming(IncomingVals[AllocaNo], Pred); @@ -960,8 +983,11 @@ continue; // what value were we writing? - IncomingVals[ai->second] = SI->getOperand(0); + unsigned AllocaNo = ai->second; + IncomingVals[AllocaNo] = SI->getOperand(0); + // Record debuginfo for the store before removing it. + IncomingLocs[AllocaNo] = SI->getDebugLoc(); for (DbgInfoIntrinsic *DII : AllocaDbgDeclares[ai->second]) ConvertDebugDeclareToDebugValue(DII, SI, DIB); BB->getInstList().erase(SI); @@ -984,7 +1010,7 @@ for (; I != E; ++I) if (VisitedSuccs.insert(*I).second) - Worklist.emplace_back(*I, Pred, IncomingVals); + Worklist.emplace_back(*I, Pred, IncomingVals, IncomingLocs); goto NextIteration; } Index: test/Transforms/Mem2Reg/dbg-inline-scope-for-phi.ll =================================================================== --- /dev/null +++ test/Transforms/Mem2Reg/dbg-inline-scope-for-phi.ll @@ -0,0 +1,110 @@ +; RUN: opt -S < %s -mem2reg -verify | FileCheck %s + +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-macosx10.13.0" + +; Original source (with some whitespace removed): +; +; extern int *getp(); +; extern int cond(); +; int get1() { return *getp(); } +; int get2(int *p) { return *p; } +; int bug(int *p) { +; if (cond()) return get1(); +; else return get2(p); +; } + +define i32 @get1() !dbg !8 { + %1 = call i32* (...) @getp(), !dbg !12 + %2 = load i32, i32* %1, align 4, !dbg !13 + ret i32 %2, !dbg !14 +} + +declare i32* @getp(...) + +define i32 @get2(i32*) !dbg !15 { + %2 = alloca i32*, align 8 + store i32* %0, i32** %2, align 8 + call void @llvm.dbg.declare(metadata i32** %2, metadata !19, metadata !DIExpression()), !dbg !20 + %3 = load i32*, i32** %2, align 8, !dbg !21 + %4 = load i32, i32* %3, align 4, !dbg !22 + ret i32 %4, !dbg !23 +} + +declare void @llvm.dbg.declare(metadata, metadata, metadata) + +; CHECK-LABEL: define i32 @bug +define i32 @bug(i32*) !dbg !24 { + %2 = alloca i32, align 4 + %3 = alloca i32*, align 8 + store i32* %0, i32** %3, align 8 + call void @llvm.dbg.declare(metadata i32** %3, metadata !25, metadata !DIExpression()), !dbg !26 + %4 = call i32 (...) @cond(), !dbg !27 + %5 = icmp ne i32 %4, 0, !dbg !27 + br i1 %5, label %6, label %8, !dbg !29 + +;