aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2009-03-03 19:25:16 +0000
committerBill Wendling <isanbard@gmail.com>2009-03-03 19:25:16 +0000
commit91741821308004d7da9f32d84525f624dfa1ec27 (patch)
treed24ea62e8809442373fd9cce4960d0c3bb40e7f6
parent8a1aae4094fc633c9f32525a2e97a92bbedb645d (diff)
downloadexternal_llvm-91741821308004d7da9f32d84525f624dfa1ec27.zip
external_llvm-91741821308004d7da9f32d84525f624dfa1ec27.tar.gz
external_llvm-91741821308004d7da9f32d84525f624dfa1ec27.tar.bz2
Remove accidental check-ins in r65960. :-(
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65961 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Transforms/Utils/SimplifyCFG.cpp6
-rw-r--r--test/BugPoint/misopt-basictest.ll2
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index 96cd299..2557961 100644
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -33,10 +33,6 @@ using namespace llvm;
STATISTIC(NumSpeculations, "Number of speculative executed instructions");
-#include "llvm/Support/CommandLine.h"
-static cl::opt<bool>
-DisableXForm("disable-xform", cl::Hidden, cl::init(false));
-
/// SafeToMergeTerminators - Return true if it is safe to merge these two
/// terminator instructions together.
///
@@ -1786,7 +1782,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
}
// If we found some, do the transformation!
- if (!UncondBranchPreds.empty() && !DisableXForm) {
+ if (!UncondBranchPreds.empty()) {
while (!UncondBranchPreds.empty()) {
BasicBlock *Pred = UncondBranchPreds.back();
DOUT << "FOLDING: " << *BB
diff --git a/test/BugPoint/misopt-basictest.ll b/test/BugPoint/misopt-basictest.ll
index 6350f40..e59b4ed 100644
--- a/test/BugPoint/misopt-basictest.ll
+++ b/test/BugPoint/misopt-basictest.ll
@@ -1,4 +1,4 @@
-; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes -gcc-tool-args -m32
+; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes
@.LC0 = internal global [13 x i8] c"Hello World\0A\00" ; <[13 x i8]*> [#uses=1]