summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 96cd299242..25579614ec 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 6350f40db7..e59b4ed7d9 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]