From b3406764398ca97f9a51d86d0624e25b09af7f7f Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl@apple.com>
Date: Fri, 1 Jul 2016 15:54:46 +0000
Subject: [PATCH] Reapply "Define a module map entry for DebugInfo/CodeView."

This reapplies r274313 with two additional #include directives needed
when submodule visibility is enabled.

Fixes PR28384.

llvm-svn: 274358
---
 .../llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h    |  4 +++-
 llvm/include/llvm/module.modulemap                    | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/llvm/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h b/llvm/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h
index 51aae4fb8edf..310847ec5d2d 100644
--- a/llvm/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h
+++ b/llvm/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h
@@ -12,6 +12,8 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/DebugInfo/CodeView/CodeView.h"
+#include "llvm/DebugInfo/CodeView/CVRecord.h"
+#include "llvm/DebugInfo/CodeView/TypeRecord.h"
 #include "llvm/Support/Error.h"
 
 namespace llvm {
@@ -58,4 +60,4 @@ public:
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index d9b4bb5551b0..a906ee192671 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/include/llvm/module.modulemap
@@ -84,6 +84,17 @@ module LLVM_DebugInfo_PDB_DIA {
   module * { export * }
 }
 
+module LLVM_DebugInfo_CodeView {
+  requires cplusplus
+
+  umbrella "DebugInfo/CodeView"
+  module * { export * }
+
+  // These are intended for (repeated) textual inclusion.
+  textual header "DebugInfo/CodeView/TypeRecords.def"
+  textual header "DebugInfo/CodeView/CVSymbolTypes.def"
+}
+
 module LLVM_ExecutionEngine {
   requires cplusplus