[DLCov][NFC] Propagate annotated DebugLocs through transformations #138047
+101
−51
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In order for DebugLoc coverage testing to work, we have to firstly set annotations for intentionally-empty DebugLocs, and secondly we have to ensure that we do not drop these annotations as we propagate DebugLocs through the compiler. As the annotations exist as part of the DebugLoc class, and not DILocation, they will not survive a DebugLoc->DILocation->DebugLoc roundtrip. Therefore this patch modifies a number of places in the compiler to propagate DebugLocs directly rather than via the underlying DILocation. This has no effect on normal builds; it only ensures that during coverage builds, we do not drop annotations and therefore create false positives. The bulk of these changes are in replacing DILocation::getMergedLocation(s) with a DebugLoc equivalent, and in changing the IRBuilder to store a DebugLoc directly rather than storing DILocations in its general Metadata array.
|
@llvm/pr-subscribers-llvm-ir @llvm/pr-subscribers-debuginfo Author: Stephen Tozer (SLTozer) ChangesPart of the coverage-tracking feature, following #107279. In order for DebugLoc coverage testing to work, we firstly have to set annotations for intentionally-empty DebugLocs, and secondly we have to ensure that we do not drop these annotations as we propagate DebugLocs throughout compilation. As the annotations exist as part of the DebugLoc class, and not the underlying DILocation, they will not survive a DebugLoc->DILocation->DebugLoc roundtrip. Therefore this patch modifies a number of places in the compiler to propagate DebugLocs directly rather than via the underlying DILocation. This has no effect on the output of normal builds; it only ensures that during coverage builds, we do not drop incorrectly annotations and therefore create false positives. The bulk of these changes are in replacing DILocation::getMergedLocation(s) with a DebugLoc equivalent, and in changing the IRBuilder to store a DebugLoc directly rather than storing DILocations in its general Metadata array. We also use a new function, Patch is 20.15 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/138047.diff 20 Files Affected:
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h b/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
index 3712a7fa06d9a..22f6a5fde546a 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
@@ -100,8 +100,8 @@ class LegalizationArtifactCombiner {
const LLT DstTy = MRI.getType(DstReg);
if (isInstLegal({TargetOpcode::G_CONSTANT, {DstTy}})) {
auto &CstVal = SrcMI->getOperand(1);
- auto *MergedLocation = DILocation::getMergedLocation(
- MI.getDebugLoc().get(), SrcMI->getDebugLoc().get());
+ auto MergedLocation =
+ DebugLoc::getMergedLocation(MI.getDebugLoc(), SrcMI->getDebugLoc());
// Set the debug location to the merged location of the SrcMI and the MI
// if the aext fold is successful.
Builder.setDebugLoc(MergedLocation);
diff --git a/llvm/include/llvm/IR/DebugLoc.h b/llvm/include/llvm/IR/DebugLoc.h
index 255ceb9571909..20457c8744fe5 100644
--- a/llvm/include/llvm/IR/DebugLoc.h
+++ b/llvm/include/llvm/IR/DebugLoc.h
@@ -141,6 +141,31 @@ namespace llvm {
static inline DebugLoc getDropped() { return DebugLoc(); }
#endif // LLVM_ENABLE_DEBUGLOC_COVERAGE_TRACKING
+ static DebugLoc getMergedLocations(ArrayRef<DebugLoc> Locs);
+ static DebugLoc getMergedLocation(DebugLoc LocA, DebugLoc LocB);
+
+ /// If this DebugLoc is non-empty, returns this DebugLoc; otherwise, selects
+ /// \p Other.
+ /// In coverage-tracking builds, this also accounts for whether this or
+ /// \p Other have an annotative DebugLocKind applied, such that if both are
+ /// empty but exactly one has an annotation, we prefer that annotated
+ /// location.
+ DebugLoc orElse(DebugLoc Other) const {
+ if (*this)
+ return *this;
+#if LLVM_ENABLE_DEBUGLOC_COVERAGE_TRACKING
+ if (Other)
+ return Other;
+ if (getKind() != DebugLocKind::Normal)
+ return *this;
+ if (Other.getKind() != DebugLocKind::Normal)
+ return Other;
+ return *this;
+#else
+ return Other;
+#endif // LLVM_ENABLE_DEBUGLOC_COVERAGE_TRACKING
+ }
+
/// Get the underlying \a DILocation.
///
/// \pre !*this or \c isa<DILocation>(getAsMDNode()).
diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
index 0e68ffadc6939..5bc2bfcf2d8b5 100644
--- a/llvm/include/llvm/IR/IRBuilder.h
+++ b/llvm/include/llvm/IR/IRBuilder.h
@@ -112,12 +112,18 @@ class FMFSource {
/// Common base class shared among various IRBuilders.
class IRBuilderBase {
/// Pairs of (metadata kind, MDNode *) that should be added to all newly
- /// created instructions, like !dbg metadata.
+ /// created instructions, excluding !dbg metadata, which is stored in the
+ // StoredDL field.
SmallVector<std::pair<unsigned, MDNode *>, 2> MetadataToCopy;
+ // The DebugLoc that will be applied to instructions inserted by this builder.
+ DebugLoc StoredDL;
/// Add or update the an entry (Kind, MD) to MetadataToCopy, if \p MD is not
/// null. If \p MD is null, remove the entry with \p Kind.
void AddOrRemoveMetadataToCopy(unsigned Kind, MDNode *MD) {
+ assert(Kind != LLVMContext::MD_dbg &&
+ "MD_dbg metadata must be stored in StoredDL");
+
if (!MD) {
erase_if(MetadataToCopy, [Kind](const std::pair<unsigned, MDNode *> &KV) {
return KV.first == Kind;
@@ -237,7 +243,9 @@ class IRBuilderBase {
/// Set location information used by debugging information.
void SetCurrentDebugLocation(DebugLoc L) {
- AddOrRemoveMetadataToCopy(LLVMContext::MD_dbg, L.getAsMDNode());
+ // For !dbg metadata attachments, we use DebugLoc instead of the raw MDNode
+ // to include optional introspection data for use in Debugify.
+ StoredDL = std::move(L);
}
/// Set nosanitize metadata.
@@ -251,8 +259,12 @@ class IRBuilderBase {
/// not on \p Src will be dropped from MetadataToCopy.
void CollectMetadataToCopy(Instruction *Src,
ArrayRef<unsigned> MetadataKinds) {
- for (unsigned K : MetadataKinds)
- AddOrRemoveMetadataToCopy(K, Src->getMetadata(K));
+ for (unsigned K : MetadataKinds) {
+ if (K == LLVMContext::MD_dbg)
+ SetCurrentDebugLocation(Src->getDebugLoc());
+ else
+ AddOrRemoveMetadataToCopy(K, Src->getMetadata(K));
+ }
}
/// Get location information used by debugging information.
@@ -266,6 +278,7 @@ class IRBuilderBase {
void AddMetadataToInst(Instruction *I) const {
for (const auto &KV : MetadataToCopy)
I->setMetadata(KV.first, KV.second);
+ SetInstDebugLocation(I);
}
/// Get the return type of the current function that we're emitting
diff --git a/llvm/include/llvm/IR/Instruction.h b/llvm/include/llvm/IR/Instruction.h
index d8069b2fb02a4..ffeca8a39d6a2 100644
--- a/llvm/include/llvm/IR/Instruction.h
+++ b/llvm/include/llvm/IR/Instruction.h
@@ -695,7 +695,7 @@ class Instruction : public User,
/// applications, thus the N-way merging should be in code path.
/// The DebugLoc attached to this instruction will be overwritten by the
/// merged DebugLoc.
- void applyMergedLocation(DILocation *LocA, DILocation *LocB);
+ void applyMergedLocation(DebugLoc LocA, DebugLoc LocB);
/// Updates the debug location given that the instruction has been hoisted
/// from a block to a predecessor of that block.
diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp
index 6f5afbd2a996a..953b5cfe39800 100644
--- a/llvm/lib/CodeGen/BranchFolding.cpp
+++ b/llvm/lib/CodeGen/BranchFolding.cpp
@@ -863,7 +863,7 @@ void BranchFolder::mergeCommonTails(unsigned commonTailIndex) {
"Reached BB end within common tail");
}
assert(MI.isIdenticalTo(*Pos) && "Expected matching MIIs!");
- DL = DILocation::getMergedLocation(DL, Pos->getDebugLoc());
+ DL = DebugLoc::getMergedLocation(DL, Pos->getDebugLoc());
NextCommonInsts[i] = ++Pos;
}
MI.setDebugLoc(DL);
diff --git a/llvm/lib/CodeGen/GlobalISel/CSEMIRBuilder.cpp b/llvm/lib/CodeGen/GlobalISel/CSEMIRBuilder.cpp
index bf8e847011d7c..d4fdaa7f75c03 100644
--- a/llvm/lib/CodeGen/GlobalISel/CSEMIRBuilder.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/CSEMIRBuilder.cpp
@@ -53,8 +53,7 @@ CSEMIRBuilder::getDominatingInstrForID(FoldingSetNodeID &ID,
} else if (!dominates(MI, CurrPos)) {
// Update the spliced machineinstr's debug location by merging it with the
// debug location of the instruction at the insertion point.
- auto *Loc = DILocation::getMergedLocation(getDebugLoc().get(),
- MI->getDebugLoc().get());
+ auto Loc = DebugLoc::getMergedLocation(getDebugLoc(), MI->getDebugLoc());
MI->setDebugLoc(Loc);
CurMBB->splice(CurrPos, CurMBB, MI);
}
@@ -170,7 +169,7 @@ CSEMIRBuilder::generateCopiesIfRequired(ArrayRef<DstOp> DstOps,
if (Observer)
Observer->changingInstr(*MIB);
MIB->setDebugLoc(
- DILocation::getMergedLocation(MIB->getDebugLoc(), getDebugLoc()));
+ DebugLoc::getMergedLocation(MIB->getDebugLoc(), getDebugLoc()));
if (Observer)
Observer->changedInstr(*MIB);
}
diff --git a/llvm/lib/CodeGen/GlobalISel/LoadStoreOpt.cpp b/llvm/lib/CodeGen/GlobalISel/LoadStoreOpt.cpp
index b507c42228465..38ebea0fef99d 100644
--- a/llvm/lib/CodeGen/GlobalISel/LoadStoreOpt.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/LoadStoreOpt.cpp
@@ -371,7 +371,7 @@ bool LoadStoreOpt::doSingleStoreMerge(SmallVectorImpl<GStore *> &Stores) {
// For each store, compute pairwise merged debug locs.
DebugLoc MergedLoc = Stores.front()->getDebugLoc();
for (auto *Store : drop_begin(Stores))
- MergedLoc = DILocation::getMergedLocation(MergedLoc, Store->getDebugLoc());
+ MergedLoc = DebugLoc::getMergedLocation(MergedLoc, Store->getDebugLoc());
Builder.setInstr(*Stores.back());
Builder.setDebugLoc(MergedLoc);
diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp
index fa6b53455f145..a7f6bbc058907 100644
--- a/llvm/lib/CodeGen/MachineBasicBlock.cpp
+++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp
@@ -1575,7 +1575,7 @@ MachineBasicBlock::findBranchDebugLoc() {
DL = TI->getDebugLoc();
for (++TI ; TI != end() ; ++TI)
if (TI->isBranch())
- DL = DILocation::getMergedLocation(DL, TI->getDebugLoc());
+ DL = DebugLoc::getMergedLocation(DL, TI->getDebugLoc());
}
return DL;
}
diff --git a/llvm/lib/CodeGen/MachineSink.cpp b/llvm/lib/CodeGen/MachineSink.cpp
index aa2987b6710a3..7e5e94ff48ed8 100644
--- a/llvm/lib/CodeGen/MachineSink.cpp
+++ b/llvm/lib/CodeGen/MachineSink.cpp
@@ -1611,8 +1611,8 @@ static void performSink(MachineInstr &MI, MachineBasicBlock &SuccToSinkTo,
// location to prevent debug-info driven tools from potentially reporting
// wrong location information.
if (!SuccToSinkTo.empty() && InsertPos != SuccToSinkTo.end())
- MI.setDebugLoc(DILocation::getMergedLocation(MI.getDebugLoc(),
- InsertPos->getDebugLoc()));
+ MI.setDebugLoc(DebugLoc::getMergedLocation(MI.getDebugLoc(),
+ InsertPos->getDebugLoc()));
else
MI.setDebugLoc(DebugLoc());
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index dff9a08c2c8e0..857815e79f3f3 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -951,8 +951,8 @@ unsigned llvm::getDebugMetadataVersionFromModule(const Module &M) {
return 0;
}
-void Instruction::applyMergedLocation(DILocation *LocA, DILocation *LocB) {
- setDebugLoc(DILocation::getMergedLocation(LocA, LocB));
+void Instruction::applyMergedLocation(DebugLoc LocA, DebugLoc LocB) {
+ setDebugLoc(DebugLoc::getMergedLocation(LocA, LocB));
}
void Instruction::mergeDIAssignID(
diff --git a/llvm/lib/IR/DebugLoc.cpp b/llvm/lib/IR/DebugLoc.cpp
index 10affe3468171..5c0657d2876ca 100644
--- a/llvm/lib/IR/DebugLoc.cpp
+++ b/llvm/lib/IR/DebugLoc.cpp
@@ -142,6 +142,27 @@ DebugLoc DebugLoc::appendInlinedAt(const DebugLoc &DL, DILocation *InlinedAt,
return Last;
}
+DebugLoc DebugLoc::getMergedLocations(ArrayRef<DebugLoc> Locs) {
+ if (Locs.empty())
+ return DebugLoc();
+ if (Locs.size() == 1)
+ return Locs[0];
+ DebugLoc Merged = Locs[0];
+ for (const DebugLoc &DL : llvm::drop_begin(Locs)) {
+ Merged = getMergedLocation(Merged, DL);
+ if (!Merged)
+ break;
+ }
+ return Merged;
+}
+DebugLoc DebugLoc::getMergedLocation(DebugLoc LocA, DebugLoc LocB) {
+ if (!LocA)
+ return LocA;
+ if (!LocB)
+ return LocB;
+ return DILocation::getMergedLocation(LocA, LocB);
+}
+
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
LLVM_DUMP_METHOD void DebugLoc::dump() const { print(dbgs()); }
#endif
diff --git a/llvm/lib/IR/IRBuilder.cpp b/llvm/lib/IR/IRBuilder.cpp
index b448c0372eb0e..c64a3e4e631c9 100644
--- a/llvm/lib/IR/IRBuilder.cpp
+++ b/llvm/lib/IR/IRBuilder.cpp
@@ -61,19 +61,12 @@ Type *IRBuilderBase::getCurrentFunctionReturnType() const {
return BB->getParent()->getReturnType();
}
-DebugLoc IRBuilderBase::getCurrentDebugLocation() const {
- for (auto &KV : MetadataToCopy)
- if (KV.first == LLVMContext::MD_dbg)
- return {cast<DILocation>(KV.second)};
-
- return {};
-}
+DebugLoc IRBuilderBase::getCurrentDebugLocation() const { return StoredDL; }
void IRBuilderBase::SetInstDebugLocation(Instruction *I) const {
- for (const auto &KV : MetadataToCopy)
- if (KV.first == LLVMContext::MD_dbg) {
- I->setDebugLoc(DebugLoc(KV.second));
- return;
- }
+ // We prefer to set our current debug location if any has been set, but if
+ // our debug location is empty and I has a valid location, we shouldn't
+ // overwrite it.
+ I->setDebugLoc(StoredDL.orElse(I->getDebugLoc()));
}
Value *IRBuilderBase::CreateAggregateCast(Value *V, Type *DestTy) {
diff --git a/llvm/lib/IR/Instruction.cpp b/llvm/lib/IR/Instruction.cpp
index 6f858110fb8ce..598ecfd18f5a5 100644
--- a/llvm/lib/IR/Instruction.cpp
+++ b/llvm/lib/IR/Instruction.cpp
@@ -1355,6 +1355,9 @@ void Instruction::swapProfMetadata() {
void Instruction::copyMetadata(const Instruction &SrcInst,
ArrayRef<unsigned> WL) {
+ if (WL.empty() || is_contained(WL, LLVMContext::MD_dbg))
+ setDebugLoc(getDebugLoc().orElse(SrcInst.getDebugLoc()));
+
if (!SrcInst.hasMetadata())
return;
@@ -1368,8 +1371,6 @@ void Instruction::copyMetadata(const Instruction &SrcInst,
if (WL.empty() || WLS.count(MD.first))
setMetadata(MD.first, MD.second);
}
- if (WL.empty() || WLS.count(LLVMContext::MD_dbg))
- setDebugLoc(SrcInst.getDebugLoc());
}
Instruction *Instruction::clone() const {
diff --git a/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp b/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
index c21a1d03630fa..3a097e342ac40 100644
--- a/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
+++ b/llvm/lib/Target/BPF/BPFPreserveStaticOffset.cpp
@@ -150,10 +150,10 @@ static CallInst *isGEPAndStore(Value *I) {
}
template <class T = Instruction>
-static DILocation *mergeDILocations(SmallVector<T *> &Insns) {
- DILocation *Merged = (*Insns.begin())->getDebugLoc();
+static DebugLoc mergeDebugLocs(SmallVector<T *> &Insns) {
+ DebugLoc Merged = (*Insns.begin())->getDebugLoc();
for (T *I : Insns)
- Merged = DILocation::getMergedLocation(Merged, I->getDebugLoc());
+ Merged = DebugLoc::getMergedLocation(Merged, I->getDebugLoc());
return Merged;
}
@@ -227,7 +227,7 @@ static Instruction *makeGEPAndLoad(Module *M, GEPChainInfo &GEP,
CallInst *Call = makeIntrinsicCall(M, Intrinsic::bpf_getelementptr_and_load,
{Load->getType()}, Args);
setParamElementType(Call, 0, GEP.SourceElementType);
- Call->applyMergedLocation(mergeDILocations(GEP.Members), Load->getDebugLoc());
+ Call->applyMergedLocation(mergeDebugLocs(GEP.Members), Load->getDebugLoc());
Call->setName((*GEP.Members.rbegin())->getName());
if (Load->isUnordered()) {
Call->setOnlyReadsMemory();
@@ -251,8 +251,7 @@ static Instruction *makeGEPAndStore(Module *M, GEPChainInfo &GEP,
setParamElementType(Call, 1, GEP.SourceElementType);
if (Store->getValueOperand()->getType()->isPointerTy())
setParamReadNone(Call, 0);
- Call->applyMergedLocation(mergeDILocations(GEP.Members),
- Store->getDebugLoc());
+ Call->applyMergedLocation(mergeDebugLocs(GEP.Members), Store->getDebugLoc());
if (Store->isUnordered()) {
Call->setOnlyWritesMemory();
Call->setOnlyAccessesArgMemory();
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
index c29cba6f675c5..4c0298bc96d12 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
@@ -1581,8 +1581,8 @@ bool InstCombinerImpl::mergeStoreIntoSuccessor(StoreInst &SI) {
// Insert a PHI node now if we need it.
Value *MergedVal = OtherStore->getValueOperand();
// The debug locations of the original instructions might differ. Merge them.
- DebugLoc MergedLoc = DILocation::getMergedLocation(SI.getDebugLoc(),
- OtherStore->getDebugLoc());
+ DebugLoc MergedLoc =
+ DebugLoc::getMergedLocation(SI.getDebugLoc(), OtherStore->getDebugLoc());
if (MergedVal != SI.getValueOperand()) {
PHINode *PN =
PHINode::Create(SI.getValueOperand()->getType(), 2, "storemerge");
diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index f807f5f4519fc..aa47326aff008 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -5334,8 +5334,7 @@ bool InstCombinerImpl::run() {
// We copy the old instruction's DebugLoc to the new instruction, unless
// InstCombine already assigned a DebugLoc to it, in which case we
// should trust the more specifically selected DebugLoc.
- if (!Result->getDebugLoc())
- Result->setDebugLoc(I->getDebugLoc());
+ Result->setDebugLoc(Result->getDebugLoc().orElse(I->getDebugLoc()));
// We also copy annotation metadata to the new instruction.
Result->copyMetadata(*I, LLVMContext::MD_annotation);
// Everything uses the new instruction now.
diff --git a/llvm/lib/Transforms/Scalar/ConstantHoisting.cpp b/llvm/lib/Transforms/Scalar/ConstantHoisting.cpp
index dd4d4efb7fecb..8e062c86af852 100644
--- a/llvm/lib/Transforms/Scalar/ConstantHoisting.cpp
+++ b/llvm/lib/Transforms/Scalar/ConstantHoisting.cpp
@@ -883,7 +883,7 @@ bool ConstantHoistingPass::emitBaseConstants(GlobalVariable *BaseGV) {
emitBaseConstants(Base, &R);
ReBasesNum++;
// Use the same debug location as the last user of the constant.
- Base->setDebugLoc(DILocation::getMergedLocation(
+ Base->setDebugLoc(DebugLoc::getMergedLocation(
Base->getDebugLoc(), R.User.Inst->getDebugLoc()));
}
assert(!Base->use_empty() && "The use list is empty!?");
diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp
index 889b43a843bef..951ffbdd7983b 100644
--- a/llvm/lib/Transforms/Scalar/LICM.cpp
+++ b/llvm/lib/Transforms/Scalar/LICM.cpp
@@ -2225,10 +2225,10 @@ bool llvm::promoteLoopAccessesToScalars(
});
// Look at all the loop uses, and try to merge their locations.
- std::vector<DILocation *> LoopUsesLocs;
- for (auto *U : LoopUses)
- LoopUsesLocs.push_back(U->getDebugLoc().get());
- auto DL = DebugLoc(DILocation::getMergedLocations(LoopUsesLocs));
+ std::vector<DebugLoc> LoopUsesLocs;
+ for (auto U : LoopUses)
+ LoopUsesLocs.push_back(U->getDebugLoc());
+ auto DL = DebugLoc::getMergedLocations(LoopUsesLocs);
// We use the SSAUpdater interface to insert phi nodes as required.
SmallVector<PHINode *, 16> NewPHIs;
diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
index 4e437e9abeb43..d20378ece4eea 100644
--- a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
+++ b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
@@ -128,7 +128,7 @@ performBlockTailMerging(Function &F, ArrayRef<BasicBlock *> BBs,
// Now, go through each block (with the current terminator type)
// we've recorded, and rewrite it to branch to the new common block.
- DILocation *CommonDebugLoc = nullptr;
+ DebugLoc CommonDebugLoc;
for (BasicBlock *BB : BBs) {
auto *Term = BB->getTerminator();
assert(Term->getOpcode() == CanonicalTerm->getOpcode() &&
@@ -145,7 +145,7 @@ performBlockTailMerging(Function &F, ArrayRef<BasicBlock *> BBs,
CommonDebugLoc = Term->getDebugLoc();
else
CommonDebugLoc =
- DILocation::getMergedLocation(CommonDebugLoc, Term->getDebugLoc());
+ DebugLoc::getMergedLocation(CommonDebugLoc, Term->getDebugLoc());
// And turn BB into a block that just unconditionally branches
// to the canonical block.
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index 8094697cdd13a..7d51f7ea9fee9 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -2077,11 +2077,11 @@ bool SimplifyCFGOpt::hoistSuccIdenticalTerminatorToSwitchOrIf(
// Ensure terminator gets a debug location, even an unknown one, in case
// it involves inlinable calls.
- SmallVector<DILocation *, 4> Locs;
+ SmallVector<DebugLoc, 4> Locs;
Locs.push_back(I1->getDebugLoc());
for (auto *OtherSuccTI : OtherSuccTIs)
Locs.push_back(OtherSuccTI->getDebugLoc());
- NT->setDebugLoc(DILocation::getMergedLocations(Locs));
+ NT->setDebugLoc(DebugLoc::getMergedLocations(Locs));
// PHIs created below will adopt NT's merged DebugLoc.
IRBuilder<NoFolder> Builder(NT);
@@ -2885,7 +2885,7 @@ static void mergeCompatibleInvokesImpl(ArrayRef<InvokeInst *> Invokes,
MergedDebugLoc = II->getDebugLoc();
else
MergedDebugLoc =
- DILocation::getMergedLocation(MergedDebugLoc, II->getDebugLoc());
+ DebugLoc::getMergedLocation...
[truncated]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of the coverage-tracking feature, following #107279.
In order for DebugLoc coverage testing to work, we firstly have to set annotations for intentionally-empty DebugLocs, and secondly we have to ensure that we do not drop these annotations as we propagate DebugLocs throughout compilation. As the annotations exist as part of the DebugLoc class, and not the underlying DILocation, they will not survive a DebugLoc->DILocation->DebugLoc roundtrip. Therefore this patch modifies a number of places in the compiler to propagate DebugLocs directly rather than via the underlying DILocation. This has no effect on the output of normal builds; it only ensures that during coverage builds, we do not drop incorrectly annotations and therefore create false positives.
The bulk of these changes are in replacing DILocation::getMergedLocation(s) with a DebugLoc equivalent, and in changing the IRBuilder to store a DebugLoc directly rather than storing DILocations in its general Metadata array. We also use a new function,
DebugLoc::orElse, which selects the "best" DebugLoc out of a pair (valid location > annotated > empty), preferring the current DebugLoc on a tie - this encapsulates the existing behaviour at a few sites where we may assign a DebugLoc to an existing instruction, while extending the logic to handle annotation DebugLocs at the same time.