Add missing include from r272607 to fix modules build, and remove out-dated workaroun...

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

diff --git a/include/llvm/Transforms/Scalar/JumpThreading.h b/include/llvm/Transforms/Scalar/JumpThreading.h
index 1d013ad7cbc9ee2ececd71bbade8dd08f12a971b..a67508a2f11473d43abcc341a26fa7f7a01cb557 100644 (file)
--- a/include/llvm/Transforms/Scalar/JumpThreading.h
+++ b/include/llvm/Transforms/Scalar/JumpThreading.h
@@ -18,6 +18,7 @@
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/Analysis/BlockFrequencyInfo.h"
+#include "llvm/Analysis/BlockFrequencyInfoImpl.h"
 #include "llvm/Analysis/BranchProbabilityInfo.h"
 #include "llvm/Analysis/LazyValueInfo.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"

diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap
index 6bddf261326e82d8e5cda71bf0001b2e6b514962..d2c3448c49d2c0c35a8e3bc4173f22823a9da0c7 100644 (file)
--- a/include/llvm/module.modulemap
+++ b/include/llvm/module.modulemap
@@ -3,9 +3,6 @@ module LLVM_Analysis {
   umbrella "Analysis"
   module * { export * }
 
-  // FIXME: Why is this excluded?
-  exclude header "Analysis/BlockFrequencyInfoImpl.h"
-
   // This is intended for (repeated) textual inclusion.
   textual header "Analysis/TargetLibraryInfo.def"
 }
@@ -41,12 +38,6 @@ module LLVM_Backend {
     // This is intended for (repeated) textual inclusion.
     textual header "Target/TargetOpcodes.def"
   }
-
-  // FIXME: Where should this go?
-  module Analysis_BlockFrequencyInfoImpl {
-    header "Analysis/BlockFrequencyInfoImpl.h"
-    export *
-  }
 }
 
 module LLVM_Bitcode { requires cplusplus umbrella "Bitcode" module * { export * } }