6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-12 02:33:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix llvm-extract -delete's lazy loading to materialize the functions that

Browse Source 
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
This commit is contained in:
Dan Gohman 2010-09-23 00:33:13 +00:00
parent 637d89fe0e
commit be2d4e77b5
2 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/Other/extract.ll Normal file
View File

@ -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
}

41
tools/llvm-extract/llvm-extract.cpp
View File

@ -26,6 +26,7 @@
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/Support/SystemUtils.h" #include "llvm/Support/SystemUtils.h"
#include "llvm/System/Signals.h" #include "llvm/System/Signals.h"
#include "llvm/ADT/SmallPtrSet.h"
#include <memory> #include <memory>
using namespace llvm; using namespace llvm;
@ -102,13 +103,39 @@ int main(int argc, char **argv) {
} }
// Materialize requisite global values. // Materialize requisite global values.
for (size_t i = 0, e = GVs.size(); i != e; ++i) { if (!DeleteFn)
GlobalValue *GV = GVs[i]; for (size_t i = 0, e = GVs.size(); i != e; ++i) {
if (GV->isMaterializable()) { GlobalValue *GV = GVs[i];
std::string ErrInfo; if (GV->isMaterializable()) {
if (GV->Materialize(&ErrInfo)) { std::string ErrInfo;
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n"; if (GV->Materialize(&ErrInfo)) {
return 1; 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;
}
} }
} }
} }