diff --git a/llvm/include/llvm/Support/CfgTraits.h b/llvm/include/llvm/Support/CfgTraits.h
diff --git a/llvm/include/llvm/Support/GenericDomTree.h b/llvm/include/llvm/Support/GenericDomTree.h
diff --git a/llvm/include/llvm/Support/GenericDomTreeConstruction.h b/llvm/include/llvm/Support/GenericDomTreeConstruction.h
@@ -53,7 +53,6 @@ namespace DomTreeBuilder {
 
 template <typename DomTreeT>
 struct SemiNCAInfo {
-  using CfgTraits = typename DomTreeT::CfgTraits;
   using NodePtr = typename DomTreeT::NodePtr;
   using NodeT = typename DomTreeT::NodeType;
   using TreeNodePtr = DomTreeNodeBase<NodeT> *;
@@ -138,7 +137,7 @@ struct SemiNCAInfo {
     // immediate dominator.
     NodePtr IDom = getIDom(BB);
 
-    assert(IDom || DT.DomTreeNodes[CfgBlockRef{}]);
+    assert(IDom || DT.DomTreeNodes[nullptr]);
     TreeNodePtr IDomNode = getNodeForBlock(IDom, DT);
 
     // Add a new tree node for this NodeT, and link it as a child of
@@ -594,7 +593,7 @@ struct SemiNCAInfo {
     NodePtr Root = IsPostDom ? nullptr : DT.Roots[0];
 
     DT.RootNode = DT.createNode(Root);
-    SNCA.attachNewSubtree(DT, DT.getRootNode());
+    SNCA.attachNewSubtree(DT, DT.RootNode);
   }
 
   void attachNewSubtree(DomTreeT& DT, const TreeNodePtr AttachTo) {
@@ -605,8 +604,7 @@ struct SemiNCAInfo {
       NodePtr W = NumToNode[i];
 
       // Don't replace this with 'count', the insertion side effect is important
-      if (DT.DomTreeNodes[CfgTraits::wrapRef(W)])
-        continue; // Haven't calculated this node yet?
+      if (DT.DomTreeNodes[W]) continue;  // Haven't calculated this node yet?
 
       NodePtr ImmDom = getIDom(W);
 
@@ -1144,7 +1142,7 @@ struct SemiNCAInfo {
     std::swap(*ChIt, IDom->Children.back());
     IDom->Children.pop_back();
 
-    DT.DomTreeNodes.erase(CfgTraits::wrapRef(TN->getBlock()));
+    DT.DomTreeNodes.erase(TN->getBlock());
   }
 
   //~~
@@ -1270,8 +1268,7 @@ struct SemiNCAInfo {
     doFullDFSWalk(DT, AlwaysDescend);
 
     for (auto &NodeToTN : DT.DomTreeNodes) {
-      const TreeNodePtr TN =
-          static_cast<const TreeNodePtr>(NodeToTN.second.get());
+      const TreeNodePtr TN = NodeToTN.second.get();
       const NodePtr BB = TN->getBlock();
 
       // Virtual root has a corresponding virtual CFG node.
@@ -1304,8 +1301,7 @@ struct SemiNCAInfo {
   // Running time: O(N).
   static bool VerifyLevels(const DomTreeT &DT) {
     for (auto &NodeToTN : DT.DomTreeNodes) {
-      const TreeNodePtr TN =
-          static_cast<const TreeNodePtr>(NodeToTN.second.get());
+      const TreeNodePtr TN = NodeToTN.second.get();
       const NodePtr BB = TN->getBlock();
       if (!BB) continue;
 
@@ -1360,8 +1356,7 @@ struct SemiNCAInfo {
     // For each tree node verify if children's DFS numbers cover their parent's
     // DFS numbers with no gaps.
     for (const auto &NodeToTN : DT.DomTreeNodes) {
-      const TreeNodePtr Node =
-          static_cast<const TreeNodePtr>(NodeToTN.second.get());
+      const TreeNodePtr Node = NodeToTN.second.get();
 
       // Handle tree leaves.
       if (Node->isLeaf()) {
@@ -1474,8 +1469,7 @@ struct SemiNCAInfo {
   // the nodes it dominated previously will now become unreachable.
   bool verifyParentProperty(const DomTreeT &DT) {
     for (auto &NodeToTN : DT.DomTreeNodes) {
-      const TreeNodePtr TN =
-          static_cast<const TreeNodePtr>(NodeToTN.second.get());
+      const TreeNodePtr TN = NodeToTN.second.get();
       const NodePtr BB = TN->getBlock();
       if (!BB || TN->isLeaf())
         continue;
@@ -1509,8 +1503,7 @@ struct SemiNCAInfo {
   // siblings will now still be reachable.
   bool verifySiblingProperty(const DomTreeT &DT) {
     for (auto &NodeToTN : DT.DomTreeNodes) {
-      const TreeNodePtr TN =
-          static_cast<const TreeNodePtr>(NodeToTN.second.get());
+      const TreeNodePtr TN = NodeToTN.second.get();
       const NodePtr BB = TN->getBlock();
       if (!BB || TN->isLeaf())
         continue;

diff --git a/llvm/lib/CodeGen/CMakeLists.txt b/llvm/lib/CodeGen/CMakeLists.txt
@@ -71,7 +71,6 @@ add_llvm_component_library(LLVMCodeGen
   MachineBlockFrequencyInfo.cpp
   MachineBlockPlacement.cpp
   MachineBranchProbabilityInfo.cpp
-  MachineCfgTraits.cpp
   MachineCombiner.cpp
   MachineCopyPropagation.cpp
   MachineCSE.cpp

diff --git a/llvm/lib/CodeGen/MachineCfgTraits.cpp b/llvm/lib/CodeGen/MachineCfgTraits.cpp
diff --git a/llvm/lib/IR/CFG.cpp b/llvm/lib/IR/CFG.cpp
diff --git a/llvm/lib/IR/CMakeLists.txt b/llvm/lib/IR/CMakeLists.txt
@@ -4,7 +4,6 @@ add_llvm_component_library(LLVMCore
   Attributes.cpp
   AutoUpgrade.cpp
   BasicBlock.cpp
-  CFG.cpp
   Comdat.cpp
   ConstantFold.cpp
   ConstantRange.cpp

diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
@@ -97,7 +97,6 @@ add_llvm_component_library(LLVMSupport
   BranchProbability.cpp
   BuryPointer.cpp
   CachePruning.cpp
-  CfgTraits.cpp
   circular_raw_ostream.cpp
   Chrono.cpp
   COM.cpp
@@ -125,7 +124,6 @@ add_llvm_component_library(LLVMSupport
   FoldingSet.cpp
   FormattedStream.cpp
   FormatVariadic.cpp
-  GenericDomTree.cpp
   GlobPattern.cpp
   GraphWriter.cpp
   Hashing.cpp

diff --git a/llvm/lib/Support/CfgTraits.cpp b/llvm/lib/Support/CfgTraits.cpp
diff --git a/llvm/lib/Support/GenericDomTree.cpp b/llvm/lib/Support/GenericDomTree.cpp
diff --git a/llvm/lib/Transforms/Scalar/ADCE.cpp b/llvm/lib/Transforms/Scalar/ADCE.cpp
@@ -295,7 +295,7 @@ void AggressiveDeadCodeElimination::initialize() {
   // return of the function.
   // We do this by seeing which of the postdomtree root children exit the
   // program, and for all others, mark the subtree live.
-  for (auto *PDTChild : children<DomTreeNode *>(PDT.getRootNode())) {
+  for (auto &PDTChild : children<DomTreeNode *>(PDT.getRootNode())) {
     auto *BB = PDTChild->getBlock();
     auto &Info = BlockInfo[BB];
     // Real function return

diff --git a/llvm/lib/Transforms/Scalar/NewGVN.cpp b/llvm/lib/Transforms/Scalar/NewGVN.cpp
@@ -511,7 +511,7 @@ class NewGVN {
   unsigned int NumFuncArgs = 0;
 
   // RPOOrdering of basic blocks
-  DenseMap<const GenericDomTreeNodeBase *, unsigned> RPOOrdering;
+  DenseMap<const DomTreeNode *, unsigned> RPOOrdering;
 
   // Congruence class info.
 
@@ -3388,10 +3388,8 @@ bool NewGVN::runGVN() {
   for (auto &B : RPOT) {
     auto *Node = DT->getNode(B);
     if (Node->getNumChildren() > 1)
-      llvm::sort(Node->GenericDomTreeNodeBase::begin(),
-                 Node->GenericDomTreeNodeBase::end(),
-                 [&](const GenericDomTreeNodeBase *A,
-                     const GenericDomTreeNodeBase *B) {
+      llvm::sort(Node->begin(), Node->end(),
+                 [&](const DomTreeNode *A, const DomTreeNode *B) {
                    return RPOOrdering[A] < RPOOrdering[B];
                  });
   }

diff --git a/llvm/lib/Transforms/Vectorize/VPlanDominatorTree.h b/llvm/lib/Transforms/Vectorize/VPlanDominatorTree.h
@@ -18,42 +18,9 @@
 #include "VPlan.h"
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/IR/Dominators.h"
-#include "llvm/Support/CfgTraits.h"
 
 namespace llvm {
 
-/// Partial CFG traits for VPlan's CFG, without a value type.
-class VPCfgTraitsBase : public CfgTraitsBase {
-public:
-  using ParentType = VPRegionBlock;
-  using BlockRef = VPBlockBase *;
-  using ValueRef = void;
-
-  static CfgBlockRef wrapRef(BlockRef block) {
-    return makeOpaque<CfgBlockRefTag>(block);
-  }
-  static BlockRef unwrapRef(CfgBlockRef block) {
-    return static_cast<BlockRef>(getOpaque(block));
-  }
-};
-
-class VPCfgTraits : public CfgTraits<VPCfgTraitsBase, VPCfgTraits> {
-public:
-  static VPRegionBlock *getBlockParent(VPBlockBase *block) {
-    return block->getParent();
-  }
-
-  static auto predecessors(VPBlockBase *block) {
-    return llvm::inverse_children<VPBlockBase *>(block);
-  }
-
-  static auto successors(VPBlockBase *block) {
-    return llvm::children<VPBlockBase *>(block);
-  }
-};
-
-template <> struct CfgTraitsFor<VPBlockBase> { using CfgTraits = VPCfgTraits; };
-
 /// Template specialization of the standard LLVM dominator tree utility for
 /// VPBlockBases.
 using VPDominatorTree = DomTreeBase<VPBlockBase>;

diff --git a/mlir/include/mlir/IR/Dominance.h b/mlir/include/mlir/IR/Dominance.h
@@ -10,47 +10,8 @@
 #define MLIR_IR_DOMINANCE_H
 
 #include "mlir/IR/RegionGraphTraits.h"
-#include "llvm/Support/CfgTraits.h"
 #include "llvm/Support/GenericDomTree.h"
 
-namespace mlir {
-
-/// Partial CFG traits for MLIR's CFG, without a value type.
-class CfgTraitsBase : public llvm::CfgTraitsBase {
-public:
-  using ParentType = Region;
-  using BlockRef = Block *;
-  using ValueRef = void;
-
-  static llvm::CfgBlockRef wrapRef(BlockRef block) {
-    return makeOpaque<llvm::CfgBlockRefTag>(block);
-  }
-  static BlockRef unwrapRef(llvm::CfgBlockRef block) {
-    return static_cast<BlockRef>(getOpaque(block));
-  }
-};
-
-class CfgTraits : public llvm::CfgTraits<CfgTraitsBase, CfgTraits> {
-public:
-  static Region *getBlockParent(Block *block) { return block->getParent(); }
-
-  static auto predecessors(Block *block) {
-    return llvm::inverse_children<Block *>(block);
-  }
-
-  static auto successors(Block *block) {
-    return llvm::children<Block *>(block);
-  }
-};
-
-} // namespace mlir
-
-namespace llvm {
-template <> struct CfgTraitsFor<mlir::Block> {
-  using CfgTraits = mlir::CfgTraits;
-};
-} // namespace llvm
-
 extern template class llvm::DominatorTreeBase<mlir::Block, false>;
 extern template class llvm::DominatorTreeBase<mlir::Block, true>;