RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

[Attributor] Only replace instruction operands

Browse Source 
This was part of D70767. When we replace the value of (call/invoke)
instructions we do not want to disturb the old call graph so we will
only replace instruction uses until we get rid of the old PM.

Accepted as part of D70767.
This commit is contained in:
Johannes Doerfert 2019-12-13 22:11:42 -06:00
parent de726cb6f1
commit 8afe7940c5
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Transforms/IPO/Attributor.cpp
View File

@ -154,6 +154,20 @@ ChangeStatus llvm::operator&(ChangeStatus l, ChangeStatus r) {
} }
///} ///}
/// For calls (and invokes) we will only replace instruction uses to not disturb
/// the old style call graph.
/// TODO: Remove this once we get rid of the old PM.
static void replaceAllInstructionUsesWith(Value &Old, Value &New) {
if (!isa<CallBase>(Old))
return Old.replaceAllUsesWith(&New);
SmallVector<Use *, 8> Uses;
for (Use &U : Old.uses())
if (isa<Instruction>(U.getUser()))
Uses.push_back(&U);
for (Use *U : Uses)
U->set(&New);
}
/// Recursively visit all values that might become \p IRP at some point. This /// Recursively visit all values that might become \p IRP at some point. This
/// will be done by looking through cast instructions, selects, phis, and calls /// will be done by looking through cast instructions, selects, phis, and calls
/// with the "returned" attribute. Once we cannot look through the value any /// with the "returned" attribute. Once we cannot look through the value any
@ -992,7 +1006,7 @@ ChangeStatus AAReturnedValuesImpl::manifest(Attributor &A) {
auto ReplaceCallSiteUsersWith = [](CallBase &CB, Constant &C) { auto ReplaceCallSiteUsersWith = [](CallBase &CB, Constant &C) {
if (CB.getNumUses() == 0 || CB.isMustTailCall()) if (CB.getNumUses() == 0 || CB.isMustTailCall())
return ChangeStatus::UNCHANGED; return ChangeStatus::UNCHANGED;
CB.replaceAllUsesWith(&C); replaceAllInstructionUsesWith(CB, C);
return ChangeStatus::CHANGED; return ChangeStatus::CHANGED;
}; };
@ -2535,7 +2549,7 @@ struct AAIsDeadFunction : public AAIsDead {
CallInst *CI = createCallMatchingInvoke(II); CallInst *CI = createCallMatchingInvoke(II);
CI->insertBefore(II); CI->insertBefore(II);
CI->takeName(II); CI->takeName(II);
II->replaceAllUsesWith(CI); replaceAllInstructionUsesWith(*II, *CI);
// If this is a nounwind + mayreturn invoke we only remove the unwind edge. // If this is a nounwind + mayreturn invoke we only remove the unwind edge.
// This is done by moving the invoke into a new and dead block and connecting // This is done by moving the invoke into a new and dead block and connecting
@ -3920,7 +3934,7 @@ struct AAValueSimplifyImpl : AAValueSimplify {
if (!V.user_empty() && &V != C && V.getType() == C->getType()) { if (!V.user_empty() && &V != C && V.getType() == C->getType()) {
LLVM_DEBUG(dbgs() << "[Attributor][ValueSimplify] " << V << " -> " << *C LLVM_DEBUG(dbgs() << "[Attributor][ValueSimplify] " << V << " -> " << *C
<< "\n"); << "\n");
V.replaceAllUsesWith(C); replaceAllInstructionUsesWith(V, *C);
Changed = ChangeStatus::CHANGED; Changed = ChangeStatus::CHANGED;
} }
} }
@ -4160,7 +4174,7 @@ struct AAHeapToStackImpl : public AAHeapToStack {
AI = new BitCastInst(AI, MallocCall->getType(), "malloc_bc", AI = new BitCastInst(AI, MallocCall->getType(), "malloc_bc",
AI->getNextNode()); AI->getNextNode());
MallocCall->replaceAllUsesWith(AI); replaceAllInstructionUsesWith(*MallocCall, *AI);
if (auto *II = dyn_cast<InvokeInst>(MallocCall)) { if (auto *II = dyn_cast<InvokeInst>(MallocCall)) {
auto *NBB = II->getNormalDest(); auto *NBB = II->getNormalDest();