[WinEH] Add and use hasEHPadSuccessor instead of getLandingPadSuccessor

[oota-llvm.git] / include / llvm / CodeGen / MachineBranchProbabilityInfo.h

diff --git a/include/llvm/CodeGen/MachineBranchProbabilityInfo.h b/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
index 55b96961c35b7cde927a5c42a6bd7e4cc4c35ed3..058ab32f3aa993683b0edaf6ee2cdcd7949bfe13 100644 (file)
--- a/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
+++ b/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
@@ -18,6 +18,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Support/BranchProbability.h"
 #include <climits>
+#include <numeric>
 
 namespace llvm {
 
@@ -59,10 +60,6 @@ public:
   // adjustment. Any edge weights used with the sum should be divided by Scale.
   uint32_t getSumForBlock(const MachineBasicBlock *MBB, uint32_t &Scale) const;
 
-  // Get sum of the block successors' weights, and force normalizing the
-  // successors' weights of MBB so that their sum fit within 32-bits.
-  uint32_t getSumForBlock(MachineBasicBlock *MBB) const;
-
   // A 'Hot' edge is an edge which probability is >= 80%.
   bool isEdgeHot(const MachineBasicBlock *Src,
                  const MachineBasicBlock *Dst) const;
@@ -86,34 +83,8 @@ public:
   raw_ostream &printEdgeProbability(raw_ostream &OS,
                                     const MachineBasicBlock *Src,
                                     const MachineBasicBlock *Dst) const;
-
-  // Normalize a list of weights by scaling them down so that the sum of them
-  // doesn't exceed UINT32_MAX. Return the scale.
-  template <class WeightList>
-  static uint32_t normalizeEdgeWeights(WeightList &Weights);
 };
 
-template <class WeightList>
-uint32_t
-MachineBranchProbabilityInfo::normalizeEdgeWeights(WeightList &Weights) {
-  assert(Weights.size() < UINT32_MAX && "Too many weights in the list!");
-  // First we compute the sum with 64-bits of precision.
-  uint64_t Sum = std::accumulate(Weights.begin(), Weights.end(), uint64_t(0));
-
-  // If the computed sum fits in 32-bits, we're done.
-  if (Sum <= UINT32_MAX)
-    return 1;
-
-  // Otherwise, compute the scale necessary to cause the weights to fit, and
-  // re-sum with that scale applied.
-  assert((Sum / UINT32_MAX) < UINT32_MAX &&
-         "The sum of weights exceeds UINT32_MAX^2!");
-  uint32_t Scale = (Sum / UINT32_MAX) + 1;
-  for (auto &W : Weights)
-    W /= Scale;
-  return Scale;
-}
-
 }