From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Tue, 14 Jun 2016 01:31:23 +0000 (+0000)
Subject: Add missing include from r272607 to fix modules build, and remove out-dated workaroun... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=364a6f6bab7db3f8c3017cbda06cc35dd102a29f;p=llvm

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


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 1d013ad7cbc..a67508a2f11 100644
--- 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 6bddf261326..d2c3448c49d 100644
--- 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 * } }