projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert r198208 and reapply:
[oota-llvm.git]
/
tools
/
bugpoint
/
bugpoint.cpp
diff --git
a/tools/bugpoint/bugpoint.cpp
b/tools/bugpoint/bugpoint.cpp
index 30494216f64ff809cd906f75f46686e420bf0596..9bc592e8626d0c1b19ff80007893557d8191d99b 100644
(file)
--- a/
tools/bugpoint/bugpoint.cpp
+++ b/
tools/bugpoint/bugpoint.cpp
@@
-16,8
+16,8
@@
#include "BugDriver.h"
#include "ToolRunner.h"
#include "llvm/IR/LLVMContext.h"
#include "BugDriver.h"
#include "ToolRunner.h"
#include "llvm/IR/LLVMContext.h"
+#include "llvm/LinkAllIR.h"
#include "llvm/LinkAllPasses.h"
#include "llvm/LinkAllPasses.h"
-#include "llvm/LinkAllVMCore.h"
#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
@@
-49,8
+49,8
@@
TimeoutValue("timeout", cl::init(300), cl::value_desc("seconds"),
static cl::opt<int>
MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
static cl::opt<int>
MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
-
cl::desc("Maximum amount of memory to use. 0 disables check."
-
" Defaults to 1
00MB (800MB under valgrind)."));
+ cl::desc("Maximum amount of memory to use. 0 disables check."
+
" Defaults to 3
00MB (800MB under valgrind)."));
static cl::opt<bool>
UseValgrind("enable-valgrind",
static cl::opt<bool>
UseValgrind("enable-valgrind",
@@
-120,6
+120,7
@@
int main(int argc, char **argv) {
PassRegistry &Registry = *PassRegistry::getPassRegistry();
initializeCore(Registry);
initializeScalarOpts(Registry);
PassRegistry &Registry = *PassRegistry::getPassRegistry();
initializeCore(Registry);
initializeScalarOpts(Registry);
+ initializeObjCARCOpts(Registry);
initializeVectorization(Registry);
initializeIPO(Registry);
initializeAnalysis(Registry);
initializeVectorization(Registry);
initializeIPO(Registry);
initializeAnalysis(Registry);
@@
-151,7
+152,7
@@
int main(int argc, char **argv) {
if (sys::RunningOnValgrind() || UseValgrind)
MemoryLimit = 800;
else
if (sys::RunningOnValgrind() || UseValgrind)
MemoryLimit = 800;
else
- MemoryLimit =
1
00;
+ MemoryLimit =
3
00;
}
BugDriver D(argv[0], FindBugs, TimeoutValue, MemoryLimit,
}
BugDriver D(argv[0], FindBugs, TimeoutValue, MemoryLimit,