[PM/AA] Hoist the value handle definition for CFLAA into the header to

satisfy libc++'s std::forward_list which requires the value type to be
complete.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@245011 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Analysis/CFLAliasAnalysis.h b/include/llvm/Analysis/CFLAliasAnalysis.h
index 4a151d5a965df052efb8fc5d9cb82fbf20f49d65..07e0bdcd4f0519f93f94e35773ebf9ba95572fc8 100644 (file)
--- a/include/llvm/Analysis/CFLAliasAnalysis.h
+++ b/include/llvm/Analysis/CFLAliasAnalysis.h
@@ -20,6 +20,7 @@
 #include "llvm/ADT/Optional.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/ValueHandle.h"
 #include "llvm/Pass.h"
 #include <forward_list>
 
@@ -27,7 +28,27 @@ namespace llvm {
 
 class CFLAliasAnalysis : public ImmutablePass, public AliasAnalysis {
   struct FunctionInfo;
-  struct FunctionHandle;
+
+  struct FunctionHandle final : public CallbackVH {
+    FunctionHandle(Function *Fn, CFLAliasAnalysis *CFLAA)
+        : CallbackVH(Fn), CFLAA(CFLAA) {
+      assert(Fn != nullptr);
+      assert(CFLAA != nullptr);
+    }
+
+    void deleted() override { removeSelfFromCache(); }
+    void allUsesReplacedWith(Value *) override { removeSelfFromCache(); }
+
+  private:
+    CFLAliasAnalysis *CFLAA;
+
+    void removeSelfFromCache() {
+      assert(CFLAA != nullptr);
+      auto *Val = getValPtr();
+      CFLAA->evict(cast<Function>(Val));
+      setValPtr(nullptr);
+    }
+  };
 
   /// \brief Cached mapping of Functions to their StratifiedSets.
   /// If a function's sets are currently being built, it is marked

diff --git a/lib/Analysis/CFLAliasAnalysis.cpp b/lib/Analysis/CFLAliasAnalysis.cpp
index 958ba95b3e6333562f67d11acff8653eccdb79b5..ea624aee4fb1b884626694e7e7e8193560e2aa46 100644 (file)
--- a/lib/Analysis/CFLAliasAnalysis.cpp
+++ b/lib/Analysis/CFLAliasAnalysis.cpp
@@ -38,7 +38,6 @@
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstVisitor.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/ValueHandle.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/Compiler.h"
@@ -74,27 +73,6 @@ struct CFLAliasAnalysis::FunctionInfo {
       : Sets(std::move(S)), ReturnedValues(std::move(RV)) {}
 };
 
-struct CFLAliasAnalysis::FunctionHandle final : public CallbackVH {
-  FunctionHandle(Function *Fn, CFLAliasAnalysis *CFLAA)
-      : CallbackVH(Fn), CFLAA(CFLAA) {
-    assert(Fn != nullptr);
-    assert(CFLAA != nullptr);
-  }
-
-  void deleted() override { removeSelfFromCache(); }
-  void allUsesReplacedWith(Value *) override { removeSelfFromCache(); }
-
-private:
-  CFLAliasAnalysis *CFLAA;
-
-  void removeSelfFromCache() {
-    assert(CFLAA != nullptr);
-    auto *Val = getValPtr();
-    CFLAA->evict(cast<Function>(Val));
-    setValPtr(nullptr);
-  }
-};
-
 CFLAliasAnalysis::CFLAliasAnalysis() : ImmutablePass(ID) {
   initializeCFLAliasAnalysisPass(*PassRegistry::getPassRegistry());
 }