From 1c85503e381423f20769582b6ab169bce9cfe2a2 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 3 Mar 2009 19:25:16 +0000 Subject: [PATCH] Remove accidental check-ins in r65960. :-( git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65961 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/SimplifyCFG.cpp | 6 +----- test/BugPoint/misopt-basictest.ll | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 96cd299242d..25579614ecf 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 -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 6350f40db7a..e59b4ed7d90 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]