From 71c30a14b7c808f12025414e2ad01fc8f39a5bfc Mon Sep 17 00:00:00 2001 From: Jacques Pienaar Date: Fri, 15 Jul 2016 14:41:04 +0000 Subject: Rename AnalyzeBranch* to analyzeBranch*. Summary: NFC. Rename AnalyzeBranch/AnalyzeBranchPredicate to analyzeBranch/analyzeBranchPredicate to follow LLVM coding style and be consistent with TargetInstrInfo's analyzeCompare and analyzeSelect. Reviewers: tstellarAMD, mcrosier Subscribers: mcrosier, jholewinski, jfb, arsenm, dschuff, jyknight, dsanders, nemanjai Differential Revision: https://reviews.llvm.org/D22409 llvm-svn: 275564 --- llvm/lib/CodeGen/MachineBlockPlacement.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'llvm/lib/CodeGen/MachineBlockPlacement.cpp') diff --git a/llvm/lib/CodeGen/MachineBlockPlacement.cpp b/llvm/lib/CodeGen/MachineBlockPlacement.cpp index 9f8ed7776e9..baf45812c70 100644 --- a/llvm/lib/CodeGen/MachineBlockPlacement.cpp +++ b/llvm/lib/CodeGen/MachineBlockPlacement.cpp @@ -1418,7 +1418,7 @@ void MachineBlockPlacement::buildCFGChains() { for (;;) { Cond.clear(); MachineBasicBlock *TBB = nullptr, *FBB = nullptr; // For AnalyzeBranch. - if (!TII->AnalyzeBranch(*BB, TBB, FBB, Cond) || !FI->canFallThrough()) + if (!TII->analyzeBranch(*BB, TBB, FBB, Cond) || !FI->canFallThrough()) break; MachineFunction::iterator NextFI = std::next(FI); @@ -1506,7 +1506,7 @@ void MachineBlockPlacement::buildCFGChains() { // before layout, and no longer fall-through it after layout; or // o. just opposite. // - // AnalyzeBranch() may return erroneous value for FBB when these two + // analyzeBranch() may return erroneous value for FBB when these two // situations take place. For the first scenario FBB is mistakenly set NULL; // for the 2nd scenario, the FBB, which is expected to be NULL, is // mistakenly pointing to "*BI". @@ -1517,19 +1517,19 @@ void MachineBlockPlacement::buildCFGChains() { // PrevBB->updateTerminator(); // Cond.clear(); // TBB = FBB = nullptr; - // if (TII->AnalyzeBranch(*PrevBB, TBB, FBB, Cond)) { + // if (TII->analyzeBranch(*PrevBB, TBB, FBB, Cond)) { // // FIXME: This should never take place. // TBB = FBB = nullptr; // } // } - if (!TII->AnalyzeBranch(*PrevBB, TBB, FBB, Cond)) + if (!TII->analyzeBranch(*PrevBB, TBB, FBB, Cond)) PrevBB->updateTerminator(); } // Fixup the last block. Cond.clear(); MachineBasicBlock *TBB = nullptr, *FBB = nullptr; // For AnalyzeBranch. - if (!TII->AnalyzeBranch(F->back(), TBB, FBB, Cond)) + if (!TII->analyzeBranch(F->back(), TBB, FBB, Cond)) F->back().updateTerminator(); BlockWorkList.clear(); @@ -1549,7 +1549,7 @@ void MachineBlockPlacement::optimizeBranches() { for (MachineBasicBlock *ChainBB : FunctionChain) { Cond.clear(); MachineBasicBlock *TBB = nullptr, *FBB = nullptr; // For AnalyzeBranch. - if (!TII->AnalyzeBranch(*ChainBB, TBB, FBB, Cond, /*AllowModify*/ true)) { + if (!TII->analyzeBranch(*ChainBB, TBB, FBB, Cond, /*AllowModify*/ true)) { // If PrevBB has a two-way branch, try to re-order the branches // such that we branch to the successor with higher probability first. if (TBB && !Cond.empty() && FBB && -- cgit v1.2.3