[llvm] r340153 - [SimplifyCFG] Replace some uses of bitwise or with logical or
Justin Bogner via llvm-commits
llvm-commits at lists.llvm.org
Sun Aug 19 23:37:11 PDT 2018
Author: bogner
Date: Sun Aug 19 23:37:11 2018
New Revision: 340153
URL: http://llvm.org/viewvc/llvm-project?rev=340153&view=rev
Log:
[SimplifyCFG] Replace some uses of bitwise or with logical or
It's clearer to use logical or for boolean values. Thanks to Steven
Zhang for noticing!
Modified:
llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=340153&r1=340152&r2=340153&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Sun Aug 19 23:37:11 2018
@@ -2249,7 +2249,7 @@ static bool FoldCondBranchOnPHI(BranchIn
}
// Recurse, simplifying any other constants.
- return FoldCondBranchOnPHI(BI, DL, AC) | true;
+ return FoldCondBranchOnPHI(BI, DL, AC) || true;
}
return false;
@@ -3571,7 +3571,7 @@ static bool tryToSimplifyUncondBranchWit
ICI->eraseFromParent();
}
// BB is now empty, so it is likely to simplify away.
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
// Ok, the block is reachable from the default dest. If the constant we're
@@ -3587,7 +3587,7 @@ static bool tryToSimplifyUncondBranchWit
ICI->replaceAllUsesWith(V);
ICI->eraseFromParent();
// BB is now empty, so it is likely to simplify away.
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
// The use of the icmp has to be in the 'end' block, by the only PHI node in
@@ -5583,33 +5583,33 @@ bool SimplifyCFGOpt::SimplifySwitch(Swit
// see if that predecessor totally determines the outcome of this switch.
if (BasicBlock *OnlyPred = BB->getSinglePredecessor())
if (SimplifyEqualityComparisonWithOnlyPredecessor(SI, OnlyPred, Builder))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
Value *Cond = SI->getCondition();
if (SelectInst *Select = dyn_cast<SelectInst>(Cond))
if (SimplifySwitchOnSelect(SI, Select))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
// If the block only contains the switch, see if we can fold the block
// away into any preds.
if (SI == &*BB->instructionsWithoutDebug().begin())
if (FoldValueComparisonIntoPredecessors(SI, Builder))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
// Try to transform the switch into an icmp and a branch.
if (TurnSwitchRangeIntoICmp(SI, Builder))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
// Remove unreachable cases.
if (eliminateDeadSwitchCases(SI, Options.AC, DL))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
if (switchToSelect(SI, Builder, DL, TTI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
if (Options.ForwardSwitchCondToPhi && ForwardSwitchConditionToPHI(SI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
// The conversion from switch to lookup tables results in difficult-to-analyze
// code and makes pruning branches much harder. This is a problem if the
@@ -5618,10 +5618,10 @@ bool SimplifyCFGOpt::SimplifySwitch(Swit
// optimisation pipeline.
if (Options.ConvertSwitchToLookupTable &&
SwitchToLookupTable(SI, Builder, DL, TTI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
if (ReduceSwitchRange(SI, Builder, DL, TTI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
return false;
}
@@ -5659,7 +5659,7 @@ bool SimplifyCFGOpt::SimplifyIndirectBr(
if (SelectInst *SI = dyn_cast<SelectInst>(IBI->getAddress())) {
if (SimplifyIndirectBrOnSelect(IBI, SI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
return Changed;
}
@@ -5787,7 +5787,7 @@ bool SimplifyCFGOpt::SimplifyUncondBranc
// predecessor and use logical operations to update the incoming value
// for PHI nodes in common successor.
if (FoldBranchToCommonDest(BI, Options.BonusInstThreshold))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
return false;
}
@@ -5815,18 +5815,18 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
// switch.
if (BasicBlock *OnlyPred = BB->getSinglePredecessor())
if (SimplifyEqualityComparisonWithOnlyPredecessor(BI, OnlyPred, Builder))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
// This block must be empty, except for the setcond inst, if it exists.
// Ignore dbg intrinsics.
auto I = BB->instructionsWithoutDebug().begin();
if (&*I == BI) {
if (FoldValueComparisonIntoPredecessors(BI, Builder))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
} else if (&*I == cast<Instruction>(BI->getCondition())) {
++I;
if (&*I == BI && FoldValueComparisonIntoPredecessors(BI, Builder))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
}
@@ -5853,7 +5853,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
: ConstantInt::getFalse(BB->getContext());
BI->setCondition(CI);
RecursivelyDeleteTriviallyDeadInstructions(OldCond);
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
}
}
@@ -5862,7 +5862,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
// branches to us and one of our successors, fold the comparison into the
// predecessor and use logical operations to pick the right destination.
if (FoldBranchToCommonDest(BI, Options.BonusInstThreshold))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
// We have a conditional branch to two blocks that are only reachable
// from BI. We know that the condbr dominates the two blocks, so see if
@@ -5871,7 +5871,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
if (BI->getSuccessor(0)->getSinglePredecessor()) {
if (BI->getSuccessor(1)->getSinglePredecessor()) {
if (HoistThenElseCodeToIf(BI, TTI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
} else {
// If Successor #1 has multiple preds, we may be able to conditionally
// execute Successor #0 if it branches to Successor #1.
@@ -5879,7 +5879,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
if (Succ0TI->getNumSuccessors() == 1 &&
Succ0TI->getSuccessor(0) == BI->getSuccessor(1))
if (SpeculativelyExecuteBB(BI, BI->getSuccessor(0), TTI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
} else if (BI->getSuccessor(1)->getSinglePredecessor()) {
// If Successor #0 has multiple preds, we may be able to conditionally
@@ -5888,7 +5888,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
if (Succ1TI->getNumSuccessors() == 1 &&
Succ1TI->getSuccessor(0) == BI->getSuccessor(0))
if (SpeculativelyExecuteBB(BI, BI->getSuccessor(1), TTI))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
}
// If this is a branch on a phi node in the current block, thread control
@@ -5896,14 +5896,14 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
if (PHINode *PN = dyn_cast<PHINode>(BI->getCondition()))
if (PN->getParent() == BI->getParent())
if (FoldCondBranchOnPHI(BI, DL, Options.AC))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
// Scan predecessor blocks for conditional branches.
for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI)
if (BranchInst *PBI = dyn_cast<BranchInst>((*PI)->getTerminator()))
if (PBI != BI && PBI->isConditional())
if (SimplifyCondBranchToCondBranch(PBI, BI, DL))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
// Look for diamond patterns.
if (MergeCondStores)
@@ -5911,7 +5911,7 @@ bool SimplifyCFGOpt::SimplifyCondBranch(
if (BranchInst *PBI = dyn_cast<BranchInst>(PrevBB->getTerminator()))
if (PBI != BI && PBI->isConditional())
if (mergeConditionalStores(PBI, BI, DL))
- return simplifyCFG(BB, TTI, Options) | true;
+ return simplifyCFG(BB, TTI, Options) || true;
return false;
}
More information about the llvm-commits
mailing list