Skip to content

Commit 724abc4

Browse files
SLTozerSLTozer
committed
[Annotate][DLCov] Annotate intentionally dropped/empty DebugLocs in existing code
Following the work in PR llvm#107279, this patch applies the annotative DebugLocs, which indicate that a particular instruction is intentionally missing a location for a given reason, to existing sites in the compiler where their conditions apply. This is a no-op in ordinary LLVM builds (each function `get<Type>` simply expands to `DebugLoc()`), but marks the instruction in coverage-tracking builds so that it will be ignored by Debugify, allowing only real errors to be reported. As a side-effect of this, it also clarifies the intention behind the missing DebugLoc to a reader.
1 parent b54ea1f commit 724abc4

20 files changed

+84
-38
lines changed

‎llvm/lib/Transforms/IPO/GlobalOpt.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,8 +1494,14 @@ processInternalGlobal(GlobalVariable *GV, const GlobalStatus &GS,
14941494
// FIXME: Pass Global's alignment when globals have alignment
14951495
AllocaInst *Alloca = new AllocaInst(ElemTy, DL.getAllocaAddrSpace(),
14961496
nullptr, GV->getName(), FirstI);
1497-
if (!isa<UndefValue>(GV->getInitializer()))
1498-
new StoreInst(GV->getInitializer(), Alloca, FirstI);
1497+
Alloca->setDebugLoc(DebugLoc::getCompilerGenerated());
1498+
if (!isa<UndefValue>(GV->getInitializer())) {
1499+
auto *SI = new StoreInst(GV->getInitializer(), Alloca, FirstI);
1500+
// FIXME: We're localizing a global and creating a store instruction for
1501+
// the initial value of that global. Could we logically use the global
1502+
// variable's (if one exists) line for this?
1503+
SI->setDebugLoc(DebugLoc::getCompilerGenerated());
1504+
}
14991505

15001506
GV->replaceAllUsesWith(Alloca);
15011507
GV->eraseFromParent();

‎llvm/lib/Transforms/IPO/IROutliner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ static void moveFunctionData(Function &Old, Function &New,
730730
// other outlined instructions.
731731
if (!isa<CallInst>(&Val)) {
732732
// Remove the debug information for outlined functions.
733-
Val.setDebugLoc(DebugLoc());
733+
Val.dropLocation();
734734

735735
// Loop info metadata may contain line locations. Update them to have no
736736
// value in the new subprogram since the outlined code could be from
@@ -1864,7 +1864,7 @@ replaceArgumentUses(OutlinableRegion &Region,
18641864
Value *ValueOperand = SI->getValueOperand();
18651865

18661866
StoreInst *NewI = cast<StoreInst>(I->clone());
1867-
NewI->setDebugLoc(DebugLoc());
1867+
NewI->dropLocation();
18681868
BasicBlock *OutputBB = VBBIt->second;
18691869
NewI->insertInto(OutputBB, OutputBB->end());
18701870
LLVM_DEBUG(dbgs() << "Move store for instruction " << *I << " to "

‎llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,14 @@ Instruction *InstCombinerImpl::foldPHIArgZextsIntoPHI(PHINode &Phi) {
870870
NewPhi->addIncoming(NewIncoming[I], Phi.getIncomingBlock(I));
871871

872872
InsertNewInstBefore(NewPhi, Phi.getIterator());
873-
return CastInst::CreateZExtOrBitCast(NewPhi, Phi.getType());
873+
auto *CI = CastInst::CreateZExtOrBitCast(NewPhi, Phi.getType());
874+
875+
// We use a dropped location here because the new ZExt is necessarily a merge
876+
// of ZExtInsts and at least one constant from incoming branches; the presence
877+
// of the constant means we have no viable DebugLoc from that branch, and
878+
// therefore we must use a dropped location.
879+
CI->setDebugLoc(DebugLoc::getDropped());
880+
return CI;
874881
}
875882

876883
/// If all operands to a PHI node are the same "unary" operator and they all are

‎llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,8 @@ static bool processSwitch(SwitchInst *I, LazyValueInfo *LVI,
419419
BasicBlock *NewUnreachableBB =
420420
BasicBlock::Create(BB->getContext(), "default.unreachable",
421421
BB->getParent(), DefaultDest);
422-
new UnreachableInst(BB->getContext(), NewUnreachableBB);
422+
auto *UI = new UnreachableInst(BB->getContext(), NewUnreachableBB);
423+
UI->setDebugLoc(DebugLoc::getTemporary());
423424

424425
DefaultDest->removePredecessor(BB);
425426
SI->setDefaultDest(NewUnreachableBB);

‎llvm/lib/Transforms/Scalar/IndVarSimplify.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,6 +1509,7 @@ bool IndVarSimplify::canonicalizeExitCondition(Loop *L) {
15091509
auto *NewRHS = CastInst::Create(
15101510
Instruction::Trunc, RHS, LHSOp->getType(), "",
15111511
L->getLoopPreheader()->getTerminator()->getIterator());
1512+
NewRHS->setDebugLoc(DebugLoc::getDropped());
15121513
ICmp->setOperand(Swapped ? 1 : 0, LHSOp);
15131514
ICmp->setOperand(Swapped ? 0 : 1, NewRHS);
15141515
// Samesign flag cannot be preserved after narrowing the compare.

‎llvm/lib/Transforms/Scalar/JumpThreading.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2976,8 +2976,10 @@ bool JumpThreadingPass::tryToUnfoldSelectInCurrBB(BasicBlock *BB) {
29762976
continue;
29772977
// Expand the select.
29782978
Value *Cond = SI->getCondition();
2979-
if (!isGuaranteedNotToBeUndefOrPoison(Cond, nullptr, SI))
2979+
if (!isGuaranteedNotToBeUndefOrPoison(Cond, nullptr, SI)) {
29802980
Cond = new FreezeInst(Cond, "cond.fr", SI->getIterator());
2981+
cast<FreezeInst>(Cond)->setDebugLoc(DebugLoc::getTemporary());
2982+
}
29812983
MDNode *BranchWeights = getBranchWeightMDNode(*SI);
29822984
Instruction *Term =
29832985
SplitBlockAndInsertIfThen(Cond, SI, false, BranchWeights);

‎llvm/lib/Transforms/Scalar/LICM.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2249,7 +2249,7 @@ bool llvm::promoteLoopAccessesToScalars(
22492249
if (SawUnorderedAtomic)
22502250
PreheaderLoad->setOrdering(AtomicOrdering::Unordered);
22512251
PreheaderLoad->setAlignment(Alignment);
2252-
PreheaderLoad->setDebugLoc(DebugLoc());
2252+
PreheaderLoad->dropLocation();
22532253
if (AATags && LoadIsGuaranteedToExecute)
22542254
PreheaderLoad->setAAMetadata(AATags);
22552255

@@ -2802,6 +2802,7 @@ static bool hoistMulAddAssociation(Instruction &I, Loop &L,
28022802
auto *NewBO =
28032803
BinaryOperator::Create(Ins->getOpcode(), LHS, RHS,
28042804
Ins->getName() + ".reass", Ins->getIterator());
2805+
NewBO->setDebugLoc(DebugLoc::getDropped());
28052806
NewBO->copyIRFlags(Ins);
28062807
if (VariantOp == Ins)
28072808
VariantOp = NewBO;
@@ -2858,6 +2859,7 @@ static bool hoistBOAssociation(Instruction &I, Loop &L,
28582859

28592860
auto *NewBO = BinaryOperator::Create(
28602861
Opcode, LV, Inv, BO->getName() + ".reass", BO->getIterator());
2862+
NewBO->setDebugLoc(DebugLoc::getDropped());
28612863

28622864
// Copy NUW for ADDs if both instructions have it.
28632865
if (Opcode == Instruction::Add && BO->hasNoUnsignedWrap() &&

‎llvm/lib/Transforms/Scalar/LoopLoadElimination.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,14 +442,15 @@ class LoadEliminationForLoop {
442442
assert(PH && "Preheader should exist!");
443443
Value *InitialPtr = SEE.expandCodeFor(PtrSCEV->getStart(), Ptr->getType(),
444444
PH->getTerminator());
445-
Value *Initial =
445+
Instruction *Initial =
446446
new LoadInst(Cand.Load->getType(), InitialPtr, "load_initial",
447447
/* isVolatile */ false, Cand.Load->getAlign(),
448448
PH->getTerminator()->getIterator());
449449
// We don't give any debug location to Initial, because it is inserted
450450
// into the loop's preheader. A debug location inside the loop will cause
451451
// a misleading stepping when debugging. The test update-debugloc-store
452452
// -forwarded.ll checks this.
453+
Initial->setDebugLoc(DebugLoc::getDropped());
453454

454455
PHINode *PHI = PHINode::Create(Initial->getType(), 2, "store_forwarded");
455456
PHI->insertBefore(L->getHeader()->begin());

‎llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ static void buildPartialUnswitchConditionalBranch(
274274
BasicBlock &UnswitchedSucc, BasicBlock &NormalSucc, bool InsertFreeze,
275275
const Instruction *I, AssumptionCache *AC, const DominatorTree &DT) {
276276
IRBuilder<> IRB(&BB);
277+
IRB.SetCurrentDebugLocation(DebugLoc::getCompilerGenerated());
277278

278279
SmallVector<Value *> FrozenInvariants;
279280
for (Value *Inv : Invariants) {
@@ -326,6 +327,7 @@ static void buildPartialInvariantUnswitchConditionalBranch(
326327
}
327328

328329
IRBuilder<> IRB(&BB);
330+
IRB.SetCurrentDebugLocation(DebugLoc::getCompilerGenerated());
329331
Value *Cond = VMap[ToDuplicate[0]];
330332
IRB.CreateCondBr(Cond, Direction ? &UnswitchedSucc : &NormalSucc,
331333
Direction ? &NormalSucc : &UnswitchedSucc);
@@ -2365,6 +2367,7 @@ static void unswitchNontrivialInvariants(
23652367
// BI (`dyn_cast<BranchInst>(TI)`) is an in-loop instruction hoisted
23662368
// out of the loop.
23672369
Cond = new FreezeInst(Cond, Cond->getName() + ".fr", BI->getIterator());
2370+
cast<Instruction>(Cond)->setDebugLoc(DebugLoc::getDropped());
23682371
}
23692372
BI->setCondition(Cond);
23702373
DTUpdates.push_back({DominatorTree::Insert, SplitBB, ClonedPH});

‎llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,8 @@ void TailRecursionEliminator::createTailRecurseLoopHeader(CallInst *CI) {
515515
BasicBlock *NewEntry = BasicBlock::Create(F.getContext(), "", &F, HeaderBB);
516516
NewEntry->takeName(HeaderBB);
517517
HeaderBB->setName("tailrecurse");
518-
BranchInst::Create(HeaderBB, NewEntry);
518+
auto *BI = BranchInst::Create(HeaderBB, NewEntry);
519+
BI->setDebugLoc(DebugLoc::getCompilerGenerated());
519520
// If the new branch preserves the debug location of CI, it could result in
520521
// misleading stepping, if CI is located in a conditional branch.
521522
// So, here we don't give any debug location to the new branch.
@@ -801,6 +802,7 @@ void TailRecursionEliminator::cleanupAndFinalize() {
801802
SelectInst *SI =
802803
SelectInst::Create(RetKnownPN, RetPN, RI->getOperand(0),
803804
"current.ret.tr", RI->getIterator());
805+
SI->setDebugLoc(DebugLoc::getCompilerGenerated());
804806
RetSelects.push_back(SI);
805807
RI->setOperand(0, SI);
806808
}

‎llvm/lib/Transforms/Utils/InlineFunction.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,6 +1770,7 @@ static Value *HandleByValArgument(Type *ByValType, Value *Arg,
17701770
AllocaInst *NewAlloca =
17711771
new AllocaInst(ByValType, Arg->getType()->getPointerAddressSpace(),
17721772
nullptr, Alignment, Arg->getName());
1773+
NewAlloca->setDebugLoc(DebugLoc::getCompilerGenerated());
17731774
NewAlloca->insertBefore(Caller->begin()->begin());
17741775
IFI.StaticAllocas.push_back(NewAlloca);
17751776

@@ -3245,6 +3246,8 @@ llvm::InlineResult llvm::InlineFunction(CallBase &CB, InlineFunctionInfo &IFI,
32453246

32463247
// Add an unconditional branch to make this look like the CallInst case...
32473248
CreatedBranchToNormalDest = BranchInst::Create(II->getNormalDest(), CB.getIterator());
3249+
// We intend to replace this DebugLoc with another later.
3250+
CreatedBranchToNormalDest->setDebugLoc(DebugLoc::getTemporary());
32483251

32493252
// Split the basic block. This guarantees that no PHI nodes will have to be
32503253
// updated due to new incoming edges, and make the invoke case more
@@ -3348,6 +3351,8 @@ llvm::InlineResult llvm::InlineFunction(CallBase &CB, InlineFunctionInfo &IFI,
33483351
} else if (!CB.use_empty()) {
33493352
// No returns, but something is using the return value of the call. Just
33503353
// nuke the result.
3354+
if (CreatedBranchToNormalDest)
3355+
CreatedBranchToNormalDest->setDebugLoc(DebugLoc::getUnknown());
33513356
CB.replaceAllUsesWith(PoisonValue::get(CB.getType()));
33523357
}
33533358

‎llvm/lib/Transforms/Utils/Local.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3136,7 +3136,8 @@ static bool markAliveBlocks(Function &F,
31363136
BasicBlock *UnreachableNormalDest = BasicBlock::Create(
31373137
Ctx, OrigNormalDest->getName() + ".unreachable",
31383138
II->getFunction(), OrigNormalDest);
3139-
new UnreachableInst(Ctx, UnreachableNormalDest);
3139+
auto *UI = new UnreachableInst(Ctx, UnreachableNormalDest);
3140+
UI->setDebugLoc(DebugLoc::getTemporary());
31403141
II->setNormalDest(UnreachableNormalDest);
31413142
if (DTU)
31423143
DTU->applyUpdates(

‎llvm/lib/Transforms/Utils/SCCPSolver.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,9 @@ bool SCCPSolver::removeNonFeasibleEdges(BasicBlock *BB, DomTreeUpdater &DTU,
322322
NewUnreachableBB =
323323
BasicBlock::Create(DefaultDest->getContext(), "default.unreachable",
324324
DefaultDest->getParent(), DefaultDest);
325-
new UnreachableInst(DefaultDest->getContext(), NewUnreachableBB);
325+
auto *UI =
326+
new UnreachableInst(DefaultDest->getContext(), NewUnreachableBB);
327+
UI->setDebugLoc(DebugLoc::getTemporary());
326328
}
327329

328330
DefaultDest->removePredecessor(BB);

‎llvm/lib/Transforms/Utils/SSAUpdater.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ class SSAUpdaterTraits<SSAUpdater> {
318318
SSAUpdater *Updater) {
319319
PHINode *PHI =
320320
PHINode::Create(Updater->ProtoType, NumPreds, Updater->ProtoName);
321+
PHI->setDebugLoc(DebugLoc::getUnknown());
321322
PHI->insertBefore(BB->begin());
322323
return PHI;
323324
}

‎llvm/lib/Transforms/Utils/SimplifyCFG.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ static void cloneInstructionsIntoPredecessorBlockAndUpdateSSAUses(
11351135
// branch, drop it. When we fold the bonus instructions we want to make
11361136
// sure we reset their debug locations in order to avoid stepping on
11371137
// dead code caused by folding dead branches.
1138-
NewBonusInst->setDebugLoc(DebugLoc());
1138+
NewBonusInst->dropLocation();
11391139
}
11401140

11411141
RemapInstruction(NewBonusInst, VMap,
@@ -2811,7 +2811,8 @@ static void mergeCompatibleInvokesImpl(ArrayRef<InvokeInst *> Invokes,
28112811
// so just form a new block with unreachable terminator.
28122812
BasicBlock *MergedNormalDest = BasicBlock::Create(
28132813
Ctx, II0BB->getName() + ".cont", Func, InsertBeforeBlock);
2814-
new UnreachableInst(Ctx, MergedNormalDest);
2814+
auto *UI = new UnreachableInst(Ctx, MergedNormalDest);
2815+
UI->setDebugLoc(DebugLoc::getTemporary());
28152816
MergedInvoke->setNormalDest(MergedNormalDest);
28162817
}
28172818

@@ -3377,7 +3378,7 @@ bool SimplifyCFGOpt::speculativelyExecuteBB(BranchInst *BI,
33773378
if (!SpeculatedStoreValue || &I != SpeculatedStore) {
33783379
// Don't update the DILocation of dbg.assign intrinsics.
33793380
if (!isa<DbgAssignIntrinsic>(&I))
3380-
I.setDebugLoc(DebugLoc());
3381+
I.dropLocation();
33813382
}
33823383
I.dropUBImplyingAttrsAndMetadata();
33833384

@@ -5695,7 +5696,8 @@ static void createUnreachableSwitchDefault(SwitchInst *Switch,
56955696
BasicBlock *NewDefaultBlock = BasicBlock::Create(
56965697
BB->getContext(), BB->getName() + ".unreachabledefault", BB->getParent(),
56975698
OrigDefaultBlock);
5698-
new UnreachableInst(Switch->getContext(), NewDefaultBlock);
5699+
auto *UI = new UnreachableInst(Switch->getContext(), NewDefaultBlock);
5700+
UI->setDebugLoc(DebugLoc::getTemporary());
56995701
Switch->setDefaultDest(&*NewDefaultBlock);
57005702
if (DTU) {
57015703
SmallVector<DominatorTree::UpdateType, 2> Updates;

‎llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class VPBuilder {
152152
VPInstruction *createNaryOp(unsigned Opcode, ArrayRef<VPValue *> Operands,
153153
Instruction *Inst = nullptr,
154154
const Twine &Name = "") {
155-
DebugLoc DL;
155+
DebugLoc DL = DebugLoc::getUnknown();
156156
if (Inst)
157157
DL = Inst->getDebugLoc();
158158
VPInstruction *NewVPInst = createInstruction(Opcode, Operands, DL, Name);
@@ -166,7 +166,7 @@ class VPBuilder {
166166
VPInstruction *createNaryOp(unsigned Opcode,
167167
std::initializer_list<VPValue *> Operands,
168168
std::optional<FastMathFlags> FMFs = {},
169-
DebugLoc DL = {}, const Twine &Name = "") {
169+
DebugLoc DL = DebugLoc::getUnknown(), const Twine &Name = "") {
170170
if (FMFs)
171171
return tryInsertInstruction(
172172
new VPInstruction(Opcode, Operands, *FMFs, DL, Name));
@@ -187,37 +187,37 @@ class VPBuilder {
187187
VPInstruction *createOverflowingOp(unsigned Opcode,
188188
std::initializer_list<VPValue *> Operands,
189189
VPRecipeWithIRFlags::WrapFlagsTy WrapFlags,
190-
DebugLoc DL = {}, const Twine &Name = "") {
190+
DebugLoc DL = DebugLoc::getUnknown(), const Twine &Name = "") {
191191
return tryInsertInstruction(
192192
new VPInstruction(Opcode, Operands, WrapFlags, DL, Name));
193193
}
194194

195-
VPValue *createNot(VPValue *Operand, DebugLoc DL = {},
195+
VPValue *createNot(VPValue *Operand, DebugLoc DL = DebugLoc::getUnknown(),
196196
const Twine &Name = "") {
197197
return createInstruction(VPInstruction::Not, {Operand}, DL, Name);
198198
}
199199

200-
VPValue *createAnd(VPValue *LHS, VPValue *RHS, DebugLoc DL = {},
200+
VPValue *createAnd(VPValue *LHS, VPValue *RHS, DebugLoc DL = DebugLoc::getUnknown(),
201201
const Twine &Name = "") {
202202
return createInstruction(Instruction::BinaryOps::And, {LHS, RHS}, DL, Name);
203203
}
204204

205-
VPValue *createOr(VPValue *LHS, VPValue *RHS, DebugLoc DL = {},
205+
VPValue *createOr(VPValue *LHS, VPValue *RHS, DebugLoc DL = DebugLoc::getUnknown(),
206206
const Twine &Name = "") {
207207

208208
return tryInsertInstruction(new VPInstruction(
209209
Instruction::BinaryOps::Or, {LHS, RHS},
210210
VPRecipeWithIRFlags::DisjointFlagsTy(false), DL, Name));
211211
}
212212

213-
VPValue *createLogicalAnd(VPValue *LHS, VPValue *RHS, DebugLoc DL = {},
213+
VPValue *createLogicalAnd(VPValue *LHS, VPValue *RHS, DebugLoc DL = DebugLoc::getUnknown(),
214214
const Twine &Name = "") {
215215
return tryInsertInstruction(
216216
new VPInstruction(VPInstruction::LogicalAnd, {LHS, RHS}, DL, Name));
217217
}
218218

219219
VPValue *createSelect(VPValue *Cond, VPValue *TrueVal, VPValue *FalseVal,
220-
DebugLoc DL = {}, const Twine &Name = "",
220+
DebugLoc DL = DebugLoc::getUnknown(), const Twine &Name = "",
221221
std::optional<FastMathFlags> FMFs = std::nullopt) {
222222
auto *Select =
223223
FMFs ? new VPInstruction(Instruction::Select, {Cond, TrueVal, FalseVal},
@@ -231,19 +231,19 @@ class VPBuilder {
231231
/// and \p B.
232232
/// TODO: add createFCmp when needed.
233233
VPValue *createICmp(CmpInst::Predicate Pred, VPValue *A, VPValue *B,
234-
DebugLoc DL = {}, const Twine &Name = "") {
234+
DebugLoc DL = DebugLoc::getUnknown(), const Twine &Name = "") {
235235
assert(Pred >= CmpInst::FIRST_ICMP_PREDICATE &&
236236
Pred <= CmpInst::LAST_ICMP_PREDICATE && "invalid predicate");
237237
return tryInsertInstruction(
238238
new VPInstruction(Instruction::ICmp, Pred, A, B, DL, Name));
239239
}
240240

241-
VPInstruction *createPtrAdd(VPValue *Ptr, VPValue *Offset, DebugLoc DL = {},
241+
VPInstruction *createPtrAdd(VPValue *Ptr, VPValue *Offset, DebugLoc DL = DebugLoc::getUnknown(),
242242
const Twine &Name = "") {
243243
return tryInsertInstruction(
244244
new VPInstruction(Ptr, Offset, GEPNoWrapFlags::none(), DL, Name));
245245
}
246-
VPValue *createInBoundsPtrAdd(VPValue *Ptr, VPValue *Offset, DebugLoc DL = {},
246+
VPValue *createInBoundsPtrAdd(VPValue *Ptr, VPValue *Offset, DebugLoc DL = DebugLoc::getUnknown(),
247247
const Twine &Name = "") {
248248
return tryInsertInstruction(
249249
new VPInstruction(Ptr, Offset, GEPNoWrapFlags::inBounds(), DL, Name));

‎llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ class EpilogueVectorizerEpilogueLoop : public InnerLoopAndEpilogueVectorizer {
784784
/// Look for a meaningful debug location on the instruction or its operands.
785785
static DebugLoc getDebugLocFromInstOrOperands(Instruction *I) {
786786
if (!I)
787-
return DebugLoc();
787+
return DebugLoc::getUnknown();
788788

789789
DebugLoc Empty;
790790
if (I->getDebugLoc() != Empty)
@@ -796,7 +796,7 @@ static DebugLoc getDebugLocFromInstOrOperands(Instruction *I) {
796796
return OpInst->getDebugLoc();
797797
}
798798

799-
return I->getDebugLoc();
799+
return I->getDebugLoc().getCopied();
800800
}
801801

802802
/// Write a \p DebugMsg about vectorization to the debug output stream. If \p I
@@ -1909,13 +1909,15 @@ class GeneratedRTChecks {
19091909
if (SCEVCheckBlock) {
19101910
SCEVCheckBlock->getTerminator()->moveBefore(
19111911
Preheader->getTerminator()->getIterator());
1912-
new UnreachableInst(Preheader->getContext(), SCEVCheckBlock);
1912+
auto *UI = new UnreachableInst(Preheader->getContext(), SCEVCheckBlock);
1913+
UI->setDebugLoc(DebugLoc::getTemporary());
19131914
Preheader->getTerminator()->eraseFromParent();
19141915
}
19151916
if (MemCheckBlock) {
19161917
MemCheckBlock->getTerminator()->moveBefore(
19171918
Preheader->getTerminator()->getIterator());
1918-
new UnreachableInst(Preheader->getContext(), MemCheckBlock);
1919+
auto *UI = new UnreachableInst(Preheader->getContext(), MemCheckBlock);
1920+
UI->setDebugLoc(DebugLoc::getTemporary());
19191921
Preheader->getTerminator()->eraseFromParent();
19201922
}
19211923

@@ -8411,7 +8413,8 @@ void VPRecipeBuilder::createHeaderMask() {
84118413
Builder.setInsertPoint(HeaderVPBB, NewInsertionPoint);
84128414
VPValue *BlockMask = nullptr;
84138415
VPValue *BTC = Plan.getOrCreateBackedgeTakenCount();
8414-
BlockMask = Builder.createICmp(CmpInst::ICMP_ULE, IV, BTC);
8416+
BlockMask =
8417+
Builder.createICmp(CmpInst::ICMP_ULE, IV, BTC, DebugLoc::getUnknown());
84158418
BlockMaskCache[Header] = BlockMask;
84168419
}
84178420

@@ -8446,7 +8449,8 @@ void VPRecipeBuilder::createBlockInMask(BasicBlock *BB) {
84468449
continue;
84478450
}
84488451

8449-
BlockMask = Builder.createOr(BlockMask, EdgeMask, {});
8452+
BlockMask =
8453+
Builder.createOr(BlockMask, EdgeMask, DebugLoc::getCompilerGenerated());
84508454
}
84518455

84528456
BlockMaskCache[BB] = BlockMask;

0 commit comments

Comments
 (0)