Skip to content

Commit 380defd

Browse files
committed
[VPlan] Update VPInterleaveRecipe to take debug loc directly as arg (NFC)
1 parent 81601cf commit 380defd

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

llvm/lib/Transforms/Vectorize/VPlan.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,9 +2189,10 @@ class VPInterleaveRecipe : public VPRecipeBase {
21892189
public:
21902190
VPInterleaveRecipe(const InterleaveGroup<Instruction> *IG, VPValue *Addr,
21912191
ArrayRef<VPValue *> StoredValues, VPValue *Mask,
2192-
bool NeedsMaskForGaps)
2192+
bool NeedsMaskForGaps, DebugLoc DL)
21932193
: VPRecipeBase(VPDef::VPInterleaveSC, {Addr},
2194-
IG->getInsertPos()->getDebugLoc()),
2194+
DL),
2195+
21952196
IG(IG), NeedsMaskForGaps(NeedsMaskForGaps) {
21962197
for (unsigned i = 0; i < IG->getFactor(); ++i)
21972198
if (Instruction *I = IG->getMember(i)) {
@@ -2211,7 +2212,7 @@ class VPInterleaveRecipe : public VPRecipeBase {
22112212

22122213
VPInterleaveRecipe *clone() override {
22132214
return new VPInterleaveRecipe(IG, getAddr(), getStoredValues(), getMask(),
2214-
NeedsMaskForGaps);
2215+
NeedsMaskForGaps, getDebugLoc());
22152216
}
22162217

22172218
VP_CLASSOF_IMPL(VPDef::VPInterleaveSC)

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2283,7 +2283,7 @@ void VPlanTransforms::createInterleaveGroups(
22832283
: B.createPtrAdd(InsertPos->getAddr(), OffsetVPV);
22842284
}
22852285
auto *VPIG = new VPInterleaveRecipe(IG, Addr, StoredValues,
2286-
InsertPos->getMask(), NeedsMaskForGaps);
2286+
InsertPos->getMask(), NeedsMaskForGaps, InsertPos->getDebugLoc());
22872287
VPIG->insertBefore(InsertPos);
22882288

22892289
unsigned J = 0;

llvm/unittests/Transforms/Vectorize/VPlanTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ TEST_F(VPRecipeTest, CastVPInterleaveRecipeToVPUser) {
10401040
VPValue *Addr = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 1));
10411041
VPValue *Mask = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 2));
10421042
InterleaveGroup<Instruction> IG(4, false, Align(4));
1043-
VPInterleaveRecipe Recipe(&IG, Addr, {}, Mask, false);
1043+
VPInterleaveRecipe Recipe(&IG, Addr, {}, Mask, false, DebugLoc());
10441044
EXPECT_TRUE(isa<VPUser>(&Recipe));
10451045
VPRecipeBase *BaseR = &Recipe;
10461046
EXPECT_TRUE(isa<VPUser>(BaseR));

0 commit comments

Comments
 (0)