[llvm] a838aad - Move CFGDiff.h from IR to Support

[David Blaikie via llvm-commits]

Author: David Blaikie
Date: 2020-04-10T00:14:10-07:00
New Revision: a838aadae3f20b9644e2ad553d3d558a91fd8fd7

URL: https://github.com/llvm/llvm-project/commit/a838aadae3f20b9644e2ad553d3d558a91fd8fd7
DIFF: https://github.com/llvm/llvm-project/commit/a838aadae3f20b9644e2ad553d3d558a91fd8fd7.diff

LOG: Move CFGDiff.h from IR to Support

Now that it's generalized to use graph traits, it's no longer dependent
on IR.

Added: 
    llvm/include/llvm/Support/CFGDiff.h

Modified: 
    llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
    llvm/include/llvm/Analysis/MemorySSAUpdater.h
    llvm/include/llvm/module.modulemap

Removed: 
    llvm/include/llvm/IR/CFGDiff.h


################################################################################
diff  --git a/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h b/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
index 7c826780c318..fb6605285156 100644
--- a/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
+++ b/llvm/include/llvm/Analysis/IteratedDominanceFrontier.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_ANALYSIS_IDF_H
 #define LLVM_ANALYSIS_IDF_H
 
-#include "llvm/IR/CFGDiff.h"
+#include "llvm/Support/CFGDiff.h"
 #include "llvm/Support/GenericIteratedDominanceFrontier.h"
 
 namespace llvm {

diff  --git a/llvm/include/llvm/Analysis/MemorySSAUpdater.h b/llvm/include/llvm/Analysis/MemorySSAUpdater.h
index 1d34663721e3..39b0e311c7d6 100644
--- a/llvm/include/llvm/Analysis/MemorySSAUpdater.h
+++ b/llvm/include/llvm/Analysis/MemorySSAUpdater.h
@@ -39,7 +39,6 @@
 #include "llvm/Analysis/LoopIterator.h"
 #include "llvm/Analysis/MemorySSA.h"
 #include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/CFGDiff.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/OperandTraits.h"
@@ -50,6 +49,7 @@
 #include "llvm/IR/ValueHandle.h"
 #include "llvm/IR/ValueMap.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/CFGDiff.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 

diff  --git a/llvm/include/llvm/IR/CFGDiff.h b/llvm/include/llvm/Support/CFGDiff.h
similarity index 98%
rename from llvm/include/llvm/IR/CFGDiff.h
rename to llvm/include/llvm/Support/CFGDiff.h
index c50db0de79a3..94734ce70e02 100644
--- a/llvm/include/llvm/IR/CFGDiff.h
+++ b/llvm/include/llvm/Support/CFGDiff.h
@@ -11,13 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_IR_CFGDIFF_H
-#define LLVM_IR_CFGDIFF_H
+#ifndef LLVM_SUPPORT_CFGDIFF_H
+#define LLVM_SUPPORT_CFGDIFF_H
 
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/ADT/iterator.h"
 #include "llvm/ADT/iterator_range.h"
-#include "llvm/IR/CFG.h"
 #include "llvm/Support/CFGUpdate.h"
 #include "llvm/Support/type_traits.h"
 #include <cassert>
@@ -248,4 +247,4 @@ struct GraphTraits<std::pair<const GraphDiff<T, B> *, Inverse<T>>>
     : CFGViewChildren<Inverse<T>, B, true> {};
 } // end namespace llvm
 
-#endif // LLVM_IR_CFGDIFF_H
+#endif // LLVM_SUPPORT_CFGDIFF_H

diff  --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index 1709ee6e047c..4121bb0f131b 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/include/llvm/module.modulemap
@@ -249,7 +249,6 @@ module LLVM_intrinsic_gen {
 
   // Intrinsics.h
   module IR_CFG { header "IR/CFG.h" export * }
-  module IR_CFGDiff { header "IR/CFGDiff.h" export * }
   module IR_ConstantRange { header "IR/ConstantRange.h" export * }
   module IR_Dominators { header "IR/Dominators.h" export * }
   module Analysis_PostDominators { header "Analysis/PostDominators.h" export * }