This is an archive of the discontinued LLVM Phabricator instance.

Differential D60231

Include invoke'd functions for recursive extract
ClosedPublic

Authored by david2050 on Apr 3 2019, 1:17 PM.

Details

Reviewers
loladiro
• espindola
volkan
Commits
rGf498bdcebfa4: Include invoke'd functions for recursive extract
rL357735: Include invoke'd functions for recursive extract
Summary

When recursively extracting a function from a bit code file, include functions mentioned in InvokeInst as well as CallInst

Diff Detail

Event Timeline

david2050 created this revision.Apr 3 2019, 1:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 3 2019, 1:17 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B30024: Diff 193579.Apr 3 2019, 1:19 PM
loladiro added a comment.Apr 3 2019, 1:33 PM

Inline comment on implementation. The functionality looks fine to me.

tools/llvm-extract/llvm-extract.cpp
277

Just use CallBase here instead of enumerating the subclasses thereof?
Also the formatting, looks slightly off.

david2050 updated this revision to Diff 193784.Apr 4 2019, 2:25 PM

use CallBase

Harbormaster completed remote builds in B30077: Diff 193784.Apr 4 2019, 2:25 PM
loladiro accepted this revision.Apr 4 2019, 2:42 PM
loladiro added inline comments.
tools/llvm-extract/llvm-extract.cpp
276

nit: The Function * can just remain here.

This revision is now accepted and ready to land.Apr 4 2019, 2:42 PM
david2050 updated this revision to Diff 193804.Apr 4 2019, 4:25 PM
david2050 marked an inline comment as done.

cleanup

Harbormaster completed remote builds in B30083: Diff 193804.Apr 4 2019, 4:26 PM
Closed by commit rL357735: Include invoke'd functions for recursive extract (authored by david2050). · Explain WhyApr 4 2019, 4:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
tools/
llvm-extract/
8 lines
tools/
llvm-extract/
6 lines

Diff 193804

test/tools/llvm-extract/recursive.ll

; RUN: llvm-extract -func=a --recursive %s -S | FileCheck --check-prefix=CHECK-AB %s ; RUN: llvm-extract -func=a --recursive %s -S | FileCheck --check-prefix=CHECK-AB %s
; RUN: llvm-extract -func=a --recursive --delete %s -S | FileCheck --check-prefix=CHECK-CD %s ; RUN: llvm-extract -func=a --recursive --delete %s -S | FileCheck --check-prefix=CHECK-CD %s
; RUN: llvm-extract -func=d --recursive %s -S | FileCheck --check-prefix=CHECK-CD %s ; RUN: llvm-extract -func=d --recursive %s -S | FileCheck --check-prefix=CHECK-CD %s
; RUN: llvm-extract -func=e --recursive %s -S | FileCheck --check-prefix=CHECK-CD %s
; CHECK-AB: define void @a ; CHECK-AB: define void @a
; CHECK-AB: define void @b ; CHECK-AB: define void @b
; CHECK-AB-NOT: define void @c ; CHECK-AB-NOT: define void @c
; CHECK-AB-NOT: define void @d ; CHECK-AB-NOT: define void @d
; CHECK-CD-NOT: define void @a ; CHECK-CD-NOT: define void @a
; CHECK-CD-NOT: define void @b ; CHECK-CD-NOT: define void @b
Show All 13 Linesdefine void @c() {
call void @d() call void @d()
ret void ret void
} }
define void @d() { define void @d() {
call void @c() call void @c()
ret void ret void
} }
define void @e() {
invoke void @c()
to label %L unwind label %L
L:
ret void
}
No newline at end of file

tools/llvm-extract/llvm-extract.cpp

Show First 20 Lines • Show All 264 Lines • ▼ Show 20 Lines for (GlobalValue *GV : GVs) {
} }
} }
while (!Workqueue.empty()) { while (!Workqueue.empty()) {
Function *F = &*Workqueue.back(); Function *F = &*Workqueue.back();
Workqueue.pop_back(); Workqueue.pop_back();
ExitOnErr(F->materialize()); ExitOnErr(F->materialize());
for (auto &BB : *F) { for (auto &BB : *F) {
for (auto &I : BB) { for (auto &I : BB) {
auto *CI = dyn_cast<CallInst>(&I); CallBase *CB = dyn_cast<CallBase>(&I);
if (!CI) if (!CB)
continue; continue;
Function *CF = CI->getCalledFunction(); Function *CF = CB->getCalledFunction();
loladiroUnsubmitted
Not Done
ReplyInline Actions

nit: The Function * can just remain here.

loladiro: nit: The `Function *` can just remain here.
if (!CF) if (!CF)
loladiroUnsubmitted
Done
ReplyInline Actions

Just use CallBase here instead of enumerating the subclasses thereof?
Also the formatting, looks slightly off.

loladiro: Just use `CallBase` here instead of enumerating the subclasses thereof? Also the formatting…
continue; continue;
if (CF->isDeclaration() || GVs.count(CF)) if (CF->isDeclaration() || GVs.count(CF))
continue; continue;
GVs.insert(CF); GVs.insert(CF);
Workqueue.push_back(CF); Workqueue.push_back(CF);
} }
} }
} }
▲ Show 20 Lines • Show All 66 Lines • Show Last 20 Lines