From 9ddfbe4c40751c55b75b3eb6c576c5c2769ac6cc Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Thu, 16 Jun 2016 08:00:29 +0000 Subject: [PATCH] [modules] Combine Pass.h, PassSupport.h and PassAnalysisSupport.h into one module. The header files are designed to be used always together (through Pass.h). Addresses the first part of https://llvm.org/bugs/show_bug.cgi?id=27991 Patch by Cristina Cristescu and me. Reviewed by Richard Smith. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@272877 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/module.modulemap | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap index d2c3448c49d..9460a1be329 100644 --- a/include/llvm/module.modulemap +++ b/include/llvm/module.modulemap @@ -101,15 +101,22 @@ module LLVM_ExecutionEngine { exclude header "ExecutionEngine/OrcMCJITReplacement.h" } -module LLVM_IR { - requires cplusplus +module LLVM_Pass { + module Pass { + // PassSupport.h and PassAnalysisSupport.h are made available only through + // Pass.h. + header "Pass.h" + header "PassSupport.h" + header "PassAnalysisSupport.h" + export * + } - // FIXME: Is this the right place for these? - module Pass { header "Pass.h" export * } - module PassSupport { header "PassSupport.h" export * } - module PassAnalysisSupport { header "PassAnalysisSupport.h" export * } module PassRegistry { header "PassRegistry.h" export * } module InitializePasses { header "InitializePasses.h" export * } +} + +module LLVM_IR { + requires cplusplus umbrella "IR" module * { export * } -- 2.50.1