[bolt] Remove redundaunt control-flow statements (NFC)

Identified with readability-redundant-control-flow.

diff --git a/bolt/include/bolt/Core/BinaryFunction.h b/bolt/include/bolt/Core/BinaryFunction.h
index 16c0ea3..8865038 100644 (file)
--- a/bolt/include/bolt/Core/BinaryFunction.h
+++ b/bolt/include/bolt/Core/BinaryFunction.h
@@ -1652,7 +1652,6 @@ public:
     }
     OffsetToCFI.emplace(Offset, FrameInstructions.size());
     FrameInstructions.emplace_back(std::forward<MCCFIInstruction>(Inst));
-    return;
   }
 
   BinaryBasicBlock::iterator addCFIInstruction(BinaryBasicBlock *BB,

diff --git a/bolt/lib/Core/BinaryFunction.cpp b/bolt/lib/Core/BinaryFunction.cpp
index b571b32..7ee4255 100644 (file)
--- a/bolt/lib/Core/BinaryFunction.cpp
+++ b/bolt/lib/Core/BinaryFunction.cpp
@@ -2614,7 +2614,6 @@ bool BinaryFunction::replayCFIInstrs(int32_t FromState, int32_t ToState,
       // so we might as well fall-through here.
     }
     NewCFIs.push_back(CurState);
-    continue;
   }
 
   // Replay instructions while avoiding duplicates

diff --git a/bolt/lib/Core/BinaryFunctionProfile.cpp b/bolt/lib/Core/BinaryFunctionProfile.cpp
index ca9cf50..0d705cd 100644 (file)
--- a/bolt/lib/Core/BinaryFunctionProfile.cpp
+++ b/bolt/lib/Core/BinaryFunctionProfile.cpp
@@ -339,8 +339,6 @@ void BinaryFunction::inferFallThroughCounts() {
       }
     }
   }
-
-  return;
 }
 
 void BinaryFunction::clearProfile() {

diff --git a/bolt/lib/Passes/MCF.cpp b/bolt/lib/Passes/MCF.cpp
index e92202a..e7ca31e 100644 (file)
--- a/bolt/lib/Passes/MCF.cpp
+++ b/bolt/lib/Passes/MCF.cpp
@@ -86,7 +86,6 @@ void updateEdgeWeight<BinaryBasicBlock *>(EdgeWeightMap &EdgeWeights,
                                           const BinaryBasicBlock *B,
                                           double Weight) {
   EdgeWeights[std::make_pair(A, B)] = Weight;
-  return;
 }
 
 template <>
@@ -95,7 +94,6 @@ void updateEdgeWeight<Inverse<BinaryBasicBlock *>>(EdgeWeightMap &EdgeWeights,
                                                    const BinaryBasicBlock *B,
                                                    double Weight) {
   EdgeWeights[std::make_pair(B, A)] = Weight;
-  return;
 }
 
 template <class NodeT>

diff --git a/bolt/lib/Passes/ReorderAlgorithm.cpp b/bolt/lib/Passes/ReorderAlgorithm.cpp
index 0a69f71..bc0df79 100644 (file)
--- a/bolt/lib/Passes/ReorderAlgorithm.cpp
+++ b/bolt/lib/Passes/ReorderAlgorithm.cpp
@@ -250,7 +250,6 @@ void PHGreedyClusterAlgorithm::initQueue(std::vector<EdgeTy> &Queue,
 void PHGreedyClusterAlgorithm::adjustQueue(std::vector<EdgeTy> &Queue,
                                            const BinaryFunction &BF) {
   // Nothing to do.
-  return;
 }
 
 bool PHGreedyClusterAlgorithm::areClustersCompatible(const ClusterTy &Front,

diff --git a/bolt/lib/Profile/DataAggregator.cpp b/bolt/lib/Profile/DataAggregator.cpp
index 885a54f..8e500ca 100644 (file)
--- a/bolt/lib/Profile/DataAggregator.cpp
+++ b/bolt/lib/Profile/DataAggregator.cpp
@@ -316,8 +316,6 @@ void DataAggregator::processFileBuildID(StringRef FileBuildID) {
   } else {
     outs() << "PERF2BOLT: matched build-id and file name\n";
   }
-
-  return;
 }
 
 bool DataAggregator::checkPerfDataMagic(StringRef FileName) {