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

llvm-svn: 272612

2 files changed, 1 insertions, 9 deletions

diff --git a/llvm/include/llvm/Transforms/Scalar/JumpThreading.h b/llvm/include/llvm/Transforms/Scalar/JumpThreading.h
index 1d013ad7cbc..a67508a2f11 100644
--- a/llvm/include/llvm/Transforms/Scalar/JumpThreading.h
+++ b/llvm/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/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index 6bddf261326..d2c3448c49d 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/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 * } }