summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Gohman <gohman@apple.com>2010-09-23 00:33:13 +0000
committerDan Gohman <gohman@apple.com>2010-09-23 00:33:13 +0000
commitbe2d4e77b5312b8cdaee4b83810cdd98ef9abcda (patch)
tree5f795d9739f29c7a4bb2e5a5367bf1210fef68f6
parent637d89fe0eca4fa2b9c95f6c15eb69a99bae83bc (diff)
downloadllvm-be2d4e77b5312b8cdaee4b83810cdd98ef9abcda.tar.gz
llvm-be2d4e77b5312b8cdaee4b83810cdd98ef9abcda.tar.bz2
llvm-be2d4e77b5312b8cdaee4b83810cdd98ef9abcda.tar.xz
Fix llvm-extract -delete's lazy loading to materialize the functions that
will not be deleted, rather than the ones that will. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114614 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/Other/extract.ll22
-rw-r--r--tools/llvm-extract/llvm-extract.cpp41
2 files changed, 56 insertions, 7 deletions
diff --git a/test/Other/extract.ll b/test/Other/extract.ll
new file mode 100644
index 0000000000..46962d094f
--- /dev/null
+++ b/test/Other/extract.ll
@@ -0,0 +1,22 @@
+; RUN: llvm-extract -func foo -S < %s | FileCheck %s
+; RUN: llvm-extract -delete -func foo -S < %s | FileCheck --check-prefix=DELETE %s
+; RUN: llvm-as < %s > %t
+; RUN: llvm-extract -func foo -S %t | FileCheck %s
+; RUN: llvm-extract -delete -func foo -S %t | FileCheck --check-prefix=DELETE %s
+
+; llvm-extract uses lazy bitcode loading, so make sure it correctly reads
+; from bitcode files in addition to assembly files.
+
+; CHECK: define void @foo() {
+; CHECK: ret void
+; CHECK: }
+; DELETE: define void @bar() {
+; DELETE: ret void
+; DELETE: }
+
+define void @foo() {
+ ret void
+}
+define void @bar() {
+ ret void
+}
diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index 91a59e5a56..0f86dd1c86 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -26,6 +26,7 @@
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/SystemUtils.h"
#include "llvm/System/Signals.h"
+#include "llvm/ADT/SmallPtrSet.h"
#include <memory>
using namespace llvm;
@@ -102,13 +103,39 @@ int main(int argc, char **argv) {
}
// Materialize requisite global values.
- for (size_t i = 0, e = GVs.size(); i != e; ++i) {
- GlobalValue *GV = GVs[i];
- if (GV->isMaterializable()) {
- std::string ErrInfo;
- if (GV->Materialize(&ErrInfo)) {
- errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
- return 1;
+ if (!DeleteFn)
+ for (size_t i = 0, e = GVs.size(); i != e; ++i) {
+ GlobalValue *GV = GVs[i];
+ if (GV->isMaterializable()) {
+ std::string ErrInfo;
+ if (GV->Materialize(&ErrInfo)) {
+ errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
+ return 1;
+ }
+ }
+ }
+ else {
+ // Deleting. Materialize every GV that's *not* in GVs.
+ SmallPtrSet<GlobalValue *, 8> GVSet(GVs.begin(), GVs.end());
+ for (Module::global_iterator I = M->global_begin(), E = M->global_end();
+ I != E; ++I) {
+ GlobalVariable *G = I;
+ if (!GVSet.count(G) && G->isMaterializable()) {
+ std::string ErrInfo;
+ if (G->Materialize(&ErrInfo)) {
+ errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
+ return 1;
+ }
+ }
+ }
+ for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) {
+ Function *F = I;
+ if (!GVSet.count(F) && F->isMaterializable()) {
+ std::string ErrInfo;
+ if (F->Materialize(&ErrInfo)) {
+ errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
+ return 1;
+ }
}
}
}