Skip to content

Commit 989e8f9

Browse files
committed
Revert "[NFC][DebugInfo][RemoveDIs] Use iterators to insert in callsite-splitting (#74455)"
This reverts commit 34cdc91. Two buildbots say this is bad: https://lab.llvm.org/buildbot/#/builders/265/builds/861 https://lab.llvm.org/buildbot/#/builders/168/builds/17272
1 parent 067bebb commit 989e8f9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

llvm/lib/Transforms/Scalar/CallSiteSplitting.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,10 @@ static void splitCallSite(CallBase &CB,
372372
return;
373373
}
374374

375-
BasicBlock::iterator OriginalBegin = TailBB->begin();
375+
auto *OriginalBegin = &*TailBB->begin();
376376
// Replace users of the original call with a PHI mering call-sites split.
377377
if (CallPN) {
378-
CallPN->insertBefore(*TailBB, OriginalBegin);
378+
CallPN->insertBefore(OriginalBegin);
379379
CB.replaceAllUsesWith(CallPN);
380380
}
381381

@@ -399,13 +399,13 @@ static void splitCallSite(CallBase &CB,
399399
for (auto &Mapping : ValueToValueMaps)
400400
NewPN->addIncoming(Mapping[CurrentI],
401401
cast<Instruction>(Mapping[CurrentI])->getParent());
402-
NewPN->insertBefore(*TailBB, TailBB->begin());
402+
NewPN->insertBefore(&*TailBB->begin());
403403
CurrentI->replaceAllUsesWith(NewPN);
404404
}
405405
CurrentI->dropDbgValues();
406406
CurrentI->eraseFromParent();
407407
// We are done once we handled the first original instruction in TailBB.
408-
if (CurrentI == &*OriginalBegin)
408+
if (CurrentI == OriginalBegin)
409409
break;
410410
}
411411
}

0 commit comments

Comments
 (0)