[sil] Move PostOrderFunctionInfo from SILOptimizer/Analysis/PostOrderAnalysis => SIL/PostOrder.h.

include/swift/SIL/PostOrder.h

@@ -0,0 +1,100 @@
+//===--- PostOrder.h --------------------------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_SIL_POSTORDER_H
+#define SWIFT_SIL_POSTORDER_H
+
+#include "swift/Basic/Range.h"
+#include "swift/SIL/CFG.h"
+#include "swift/SIL/SILBasicBlock.h"
+#include "swift/SIL/SILFunction.h"
+#include "swift/SILOptimizer/Analysis/Analysis.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/iterator_range.h"
+#include <vector>
+
+namespace swift {
+
+class PostOrderFunctionInfo {
+  std::vector<SILBasicBlock *> PostOrder;
+  llvm::DenseMap<SILBasicBlock *, unsigned> BBToPOMap;
+
+public:
+  PostOrderFunctionInfo(SILFunction *F) {
+    for (auto *BB : make_range(po_begin(F), po_end(F))) {
+      BBToPOMap[BB] = PostOrder.size();
+      PostOrder.push_back(BB);
+    }
+  }
+
+  using iterator = decltype(PostOrder)::iterator;
+  using const_iterator = decltype(PostOrder)::const_iterator;
+  using reverse_iterator = decltype(PostOrder)::reverse_iterator;
+  using const_reverse_iterator = decltype(PostOrder)::const_reverse_iterator;
+
+  using range = iterator_range<iterator>;
+  using const_range = iterator_range<const_iterator>;
+  using reverse_range = iterator_range<reverse_iterator>;
+  using const_reverse_range = iterator_range<const_reverse_iterator>;
+
+  range getPostOrder() {
+    return make_range(PostOrder.begin(), PostOrder.end());
+  }
+  const_range getPostOrder() const {
+    return make_range(PostOrder.begin(), PostOrder.end());
+  }
+  reverse_range getReversePostOrder() {
+    return make_range(PostOrder.rbegin(), PostOrder.rend());
+  }
+  const_reverse_range getReversePostOrder() const {
+    return make_range(PostOrder.rbegin(), PostOrder.rend());
+  }
+
+  const_reverse_range getReversePostOrder(SILBasicBlock *StartBlock) const {
+    unsigned RPONumber = getRPONumber(StartBlock).getValue();
+    return getReversePostOrder(RPONumber);
+  }
+
+  const_reverse_range getReversePostOrder(unsigned RPONumber) const {
+    return make_range(std::next(PostOrder.rbegin(), RPONumber),
+                      PostOrder.rend());
+  }
+
+  using enumerated_range = EnumeratorRange<decltype(PostOrder)::iterator>;
+  enumerated_range getEnumeratedPostOrder() { return enumerate(PostOrder); }
+  using reverse_enumerated_range =
+      EnumeratorRange<decltype(PostOrder)::reverse_iterator>;
+  reverse_enumerated_range getEnumeratedReversePostOrder() {
+    return enumerate(PostOrder.rbegin(), PostOrder.rend());
+  }
+
+  unsigned size() const { return PostOrder.size(); }
+
+  Optional<unsigned> getPONumber(SILBasicBlock *BB) const {
+    auto Iter = BBToPOMap.find(BB);
+    if (Iter != BBToPOMap.end())
+      return Iter->second;
+    return None;
+  }
+
+  Optional<unsigned> getRPONumber(SILBasicBlock *BB) const {
+    auto Iter = BBToPOMap.find(BB);
+    if (Iter != BBToPOMap.end())
+      return PostOrder.size() - Iter->second - 1;
+    return None;
+  }
+};
+
+} // end swift namespace
+
+#endif

include/swift/SILOptimizer/Analysis/PostOrderAnalysis.h

@@ -13,81 +13,22 @@
 #ifndef SWIFT_SILOPTIMIZER_ANALYSIS_POSTORDERANALYSIS_H
 #define SWIFT_SILOPTIMIZER_ANALYSIS_POSTORDERANALYSIS_H
 
-#include "swift/SILOptimizer/Analysis/Analysis.h"
 #include "swift/Basic/Range.h"
 #include "swift/SIL/CFG.h"
+#include "swift/SIL/PostOrder.h"
 #include "swift/SIL/SILBasicBlock.h"
 #include "swift/SIL/SILFunction.h"
+#include "swift/SILOptimizer/Analysis/Analysis.h"
+#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/PostOrderIterator.h"
 #include "llvm/ADT/iterator_range.h"
-#include "llvm/ADT/DenseMap.h"
 #include <vector>
 
 namespace swift {
 
 class SILBasicBlock;
 class SILFunction;
 
-class PostOrderFunctionInfo {
-  std::vector<SILBasicBlock *> PostOrder;
-  llvm::DenseMap<SILBasicBlock *, unsigned> BBToPOMap;
-
-public:
-  PostOrderFunctionInfo(SILFunction *F) {
-    for (auto *BB : make_range(po_begin(F), po_end(F))) {
-      BBToPOMap[BB] = PostOrder.size();
-      PostOrder.push_back(BB);
-    }
-  }
-
-  using iterator = decltype(PostOrder)::iterator;
-  using const_iterator = decltype(PostOrder)::const_iterator;
-  using reverse_iterator = decltype(PostOrder)::reverse_iterator;
-  using const_reverse_iterator = decltype(PostOrder)::const_reverse_iterator;
-
-  using range = iterator_range<iterator>;
-  using const_range = iterator_range<const_iterator>;
-  using reverse_range = iterator_range<reverse_iterator>;
-  using const_reverse_range = iterator_range<const_reverse_iterator>;
-
-  range getPostOrder() {
-    return make_range(PostOrder.begin(), PostOrder.end());
-  }
-  const_range getPostOrder() const {
-    return make_range(PostOrder.begin(), PostOrder.end());
-  }
-  reverse_range getReversePostOrder() {
-    return make_range(PostOrder.rbegin(), PostOrder.rend());
-  }
-  const_reverse_range getReversePostOrder() const {
-    return make_range(PostOrder.rbegin(), PostOrder.rend());
-  }
-
-  using enumerated_range = EnumeratorRange<decltype(PostOrder)::iterator>;
-  enumerated_range getEnumeratedPostOrder() { return enumerate(PostOrder); }
-  using reverse_enumerated_range =
-      EnumeratorRange<decltype(PostOrder)::reverse_iterator>;
-  reverse_enumerated_range getEnumeratedReversePostOrder() {
-    return enumerate(PostOrder.rbegin(), PostOrder.rend());
-  }
-
-  unsigned size() const { return PostOrder.size(); }
-
-  Optional<unsigned> getPONumber(SILBasicBlock *BB) const {
-    auto Iter = BBToPOMap.find(BB);
-    if (Iter != BBToPOMap.end())
-      return Iter->second;
-    return None;
-  }
-
-  Optional<unsigned> getRPONumber(SILBasicBlock *BB) const {
-    auto Iter = BBToPOMap.find(BB);
-    if (Iter != BBToPOMap.end())
-      return PostOrder.size() - Iter->second - 1;
-    return None;
-  }
-};
-
 /// This class is a simple wrapper around the POT iterator provided by LLVM. It
 /// lazily re-evaluates the post order when it is invalidated so that we do not
 /// reform the post order over and over again (it can be expensive).