This is an archive of the discontinued LLVM Phabricator instance.

Differential D79801

[Attributor] Fixup block addresses after rewriting function signature
ClosedPublic

Authored by sdmitriev on May 12 2020, 1:14 PM.

Details

Reviewers
jdoerfert
sstefan1
uenoku
Commits
rG32f5ee830b0f: [Attributor] Fixup block addresses after rewriting function signature

Diff Detail

Event Timeline

sdmitriev created this revision.May 12 2020, 1:14 PM
Herald added a reviewer: sstefan1. · View Herald TranscriptMay 12 2020, 1:14 PM
Herald added a reviewer: uenoku. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, uenoku, hiraditya. · View Herald Transcript
jdoerfert accepted this revision.May 12 2020, 1:18 PM

LGTM. thx

This revision is now accepted and ready to land.May 12 2020, 1:18 PM
Closed by commit rG32f5ee830b0f: [Attributor] Fixup block addresses after rewriting function signature (authored by sdmitriev). · Explain WhyMay 12 2020, 2:00 PM
This revision was automatically updated to reflect the committed changes.
Harbormaster completed remote builds in B56474: Diff 263503.May 12 2020, 2:32 PM

Revision Contents

PathSize
llvm/
lib/
Transforms/
IPO/
8 lines
test/
Transforms/
Attributor/
33 lines

Diff 263513

llvm/lib/Transforms/IPO/Attributor.cpp

Show First 20 Lines • Show All 1,498 Lines • ▼ Show 20 Lines NewFn->setAttributes(AttributeList::get(
OldFnAttributeList.getRetAttributes(), NewArgumentAttributes)); OldFnAttributeList.getRetAttributes(), NewArgumentAttributes));
// Since we have now created the new function, splice the body of the old // Since we have now created the new function, splice the body of the old
// function right into the new function, leaving the old rotting hulk of the // function right into the new function, leaving the old rotting hulk of the
// function empty. // function empty.
NewFn->getBasicBlockList().splice(NewFn->begin(), NewFn->getBasicBlockList().splice(NewFn->begin(),
OldFn->getBasicBlockList()); OldFn->getBasicBlockList());
// Fixup block addresses to reference new function.
SmallVector<BlockAddress *, 8u> BlockAddresses;
for (User *U : OldFn->users())
if (auto *BA = dyn_cast<BlockAddress>(U))
BlockAddresses.push_back(BA);
for (auto *BA : BlockAddresses)
BA->replaceAllUsesWith(BlockAddress::get(NewFn, BA->getBasicBlock()));
// Set of all "call-like" instructions that invoke the old function mapped // Set of all "call-like" instructions that invoke the old function mapped
// to their new replacements. // to their new replacements.
SmallVector<std::pair<CallBase *, CallBase *>, 8> CallSitePairs; SmallVector<std::pair<CallBase *, CallBase *>, 8> CallSitePairs;
// Callback to create a new "call-like" instruction for a given one. // Callback to create a new "call-like" instruction for a given one.
auto CallSiteReplacementCreator = [&](AbstractCallSite ACS) { auto CallSiteReplacementCreator = [&](AbstractCallSite ACS) {
CallBase *OldCB = cast<CallBase>(ACS.getInstruction()); CallBase *OldCB = cast<CallBase>(ACS.getInstruction());
const AttributeList &OldCallAttributeList = OldCB->getAttributes(); const AttributeList &OldCallAttributeList = OldCB->getAttributes();
▲ Show 20 Lines • Show All 676 Lines • Show Last 20 Lines

llvm/test/Transforms/Attributor/misc_crash.ll

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Lines;
%1 = tail call i32 (i32*, ...) bitcast (void (i32*)* @func2a to i32 (i32*, ...)*)(i32* @var2) %1 = tail call i32 (i32*, ...) bitcast (void (i32*)* @func2a to i32 (i32*, ...)*)(i32* @var2)
br i1 %false, label %use_bb, label %ret_bb br i1 %false, label %use_bb, label %ret_bb
use_bb: use_bb:
ret i32 %1 ret i32 %1
ret_bb: ret_bb:
%2 = load i32, i32* @var2 %2 = load i32, i32* @var2
ret i32 %2 ret i32 %2
} }
define void @func4() {
; CHECK-LABEL: define {{[^@]+}}@func4
; CHECK-NEXT: call void @func5()
; CHECK-NEXT: ret void
;
call void @func5(i32 0)
ret void
}
define internal void @func5(i32 %0) {
; CHECK-LABEL: define {{[^@]+}}@func5
; CHECK-NEXT: [[TMP1:%.*]] = alloca i8*
; CHECK-NEXT: br label %block
; CHECK: block:
; CHECK-NEXT: store i8* blockaddress(@func5, %block), i8** [[TMP1]]
; CHECK-NEXT: [[TMP2:%.*]] = load i8*, i8** [[TMP1]]
; CHECK-NEXT: call void @func6(i8* [[TMP2]])
; CHECK-NEXT: ret void
;
%tmp = alloca i8*
br label %block
block:
store i8* blockaddress(@func5, %block), i8** %tmp
%addr = load i8*, i8** %tmp
call void @func6(i8* %addr)
ret void
}
; CHECK-LABEL: declare {{[^@]+}}@func6
; CHECK-SAME: (i8*)
declare void @func6(i8*)