[PATCH] D83093: DomTree: Define GraphTraits for GenericDomTreeBase

[Nicolai Hähnle via Phabricator via llvm-commits]

nhaehnle created this revision.
nhaehnle added reviewers: arsenm, RKSimon, mehdi_amini, courbet.
Herald added a subscriber: wdng.
Herald added a project: LLVM.
nhaehnle added a parent revision: D83092: DomTree: Add findSiblingOfUncle helper.
nhaehnle added a child revision: D83094: Analysis: Add a GenericCycleInfo analysis.

Allow generic graph algorithms to operate on the type-erased base classes.

Change-Id: I59735dfcea41f89d30dfa304bdfe07050b7a5a7d


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D83093

Files:
  llvm/include/llvm/IR/Dominators.h
  llvm/include/llvm/Support/GenericDomTree.h


Index: llvm/include/llvm/Support/GenericDomTree.h
===================================================================
--- llvm/include/llvm/Support/GenericDomTree.h
+++ llvm/include/llvm/Support/GenericDomTree.h
@@ -27,6 +27,7 @@
 #define LLVM_SUPPORT_GENERICDOMTREE_H
 
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallPtrSet.h"
@@ -818,6 +819,36 @@
 template <typename T>
 using PostDomTreeBase = DominatorTreeBase<T, true>;
 
+//===-------------------------------------
+// GraphTraits specializations so that the generic type-erased dominator tree
+// can be iterated by generic graph iterators.
+
+template <class Node, class ChildIterator> struct DomTreeGraphTraitsBase {
+  using NodeRef = Node *;
+  using ChildIteratorType = ChildIterator;
+  using nodes_iterator = df_iterator<Node *, df_iterator_default_set<Node *>>;
+
+  static NodeRef getEntryNode(NodeRef N) { return N; }
+  static ChildIteratorType child_begin(NodeRef N) { return N->begin(); }
+  static ChildIteratorType child_end(NodeRef N) { return N->end(); }
+
+  static nodes_iterator nodes_begin(NodeRef N) {
+    return df_begin(getEntryNode(N));
+  }
+
+  static nodes_iterator nodes_end(NodeRef N) { return df_end(getEntryNode(N)); }
+};
+
+template <>
+struct GraphTraits<GenericDomTreeNodeBase *>
+    : public DomTreeGraphTraitsBase<GenericDomTreeNodeBase,
+                                    GenericDomTreeNodeBase::iterator> {};
+
+template <>
+struct GraphTraits<const GenericDomTreeNodeBase *>
+    : public DomTreeGraphTraitsBase<const GenericDomTreeNodeBase,
+                                    GenericDomTreeNodeBase::const_iterator> {};
+
 } // end namespace llvm
 
 #endif // LLVM_SUPPORT_GENERICDOMTREE_H
Index: llvm/include/llvm/IR/Dominators.h
===================================================================
--- llvm/include/llvm/IR/Dominators.h
+++ llvm/include/llvm/IR/Dominators.h
@@ -190,22 +190,6 @@
 // DominatorTree GraphTraits specializations so the DominatorTree can be
 // iterable by generic graph iterators.
 
-template <class Node, class ChildIterator> struct DomTreeGraphTraitsBase {
-  using NodeRef = Node *;
-  using ChildIteratorType = ChildIterator;
-  using nodes_iterator = df_iterator<Node *, df_iterator_default_set<Node*>>;
-
-  static NodeRef getEntryNode(NodeRef N) { return N; }
-  static ChildIteratorType child_begin(NodeRef N) { return N->begin(); }
-  static ChildIteratorType child_end(NodeRef N) { return N->end(); }
-
-  static nodes_iterator nodes_begin(NodeRef N) {
-    return df_begin(getEntryNode(N));
-  }
-
-  static nodes_iterator nodes_end(NodeRef N) { return df_end(getEntryNode(N)); }
-};
-
 template <>
 struct GraphTraits<DomTreeNode *>
     : public DomTreeGraphTraitsBase<DomTreeNode, DomTreeNode::const_iterator> {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D83093.275235.patch
Type: text/x-patch
Size: 2881 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200702/0a5627d3/attachment.bin>