From c69102774f9739c81ae1285ed9ae62405071c63c Mon Sep 17 00:00:00 2001 From: Roman Divacky Date: Tue, 16 Mar 2010 16:51:38 +0000 Subject: Update LLVM to r98631. --- lib/Transforms/Utils/SimplifyCFG.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/Transforms/Utils/SimplifyCFG.cpp') diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index f343c3811da2e..2ce5bdcd61d43 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1826,7 +1826,7 @@ bool SimplifyCFGOpt::run(BasicBlock *BB) { // switch. if (BasicBlock *OnlyPred = BB->getSinglePredecessor()) if (SimplifyEqualityComparisonWithOnlyPredecessor(BI, OnlyPred)) - return SimplifyCFG(BB) || 1; + return SimplifyCFG(BB) | true; // This block must be empty, except for the setcond inst, if it exists. // Ignore dbg intrinsics. @@ -1860,7 +1860,7 @@ bool SimplifyCFGOpt::run(BasicBlock *BB) { // branches to us and one of our successors, fold the setcc into the // predecessor and use logical operations to pick the right destination. if (FoldBranchToCommonDest(BI)) - return SimplifyCFG(BB) | 1; + return SimplifyCFG(BB) | true; // Scan predecessor blocks for conditional branches. -- cgit v1.2.3