[llvm] 8673def - Fix modules build after MatrixBuilder patch

Raphael Isemann via llvm-commits llvm-commits at lists.llvm.org
Wed Mar 4 09:03:53 PST 2020


Author: Raphael Isemann
Date: 2020-03-04T09:03:34-08:00
New Revision: 8673def9c1dbecfc9f0dc50518c545fa20921f99

URL: https://github.com/llvm/llvm-project/commit/8673def9c1dbecfc9f0dc50518c545fa20921f99
DIFF: https://github.com/llvm/llvm-project/commit/8673def9c1dbecfc9f0dc50518c545fa20921f99.diff

LOG: Fix modules build after MatrixBuilder patch

The addition of MatrixBuilder.h broke the modules build:
```
While building module 'LLVM_intrinsic_gen' imported from llvm-project/llvm/lib/IR/AbstractCallSite.cpp:19:
While building module 'LLVM_IR' imported from llvm-project/llvm/include/llvm/IR/Argument.h:19:
In file included from <module-includes>:6:
llvm-project/llvm/include/llvm/IR/MatrixBuilder.h:19:10: fatal error: cyclic dependency in module 'LLVM_intrinsic_gen': LLVM_intrinsic_gen -> LLVM_IR -> LLVM_intrinsic_gen
         ^
While building module 'LLVM_intrinsic_gen' imported from llvm-project/llvm/lib/IR/AbstractCallSite.cpp:19:
In file included from <module-includes>:1:
llvm-project/llvm/include/llvm/IR/Argument.h:19:10: fatal error: could not build module 'LLVM_IR'
 ~~~~~~~~^~~~~~~~~~~~~~~~~
llvm-project/llvm/lib/IR/AbstractCallSite.cpp:19:10: fatal error: could not build module 'LLVM_intrinsic_gen'
 ~~~~~~~~^~~~~~~~~~~~~~~~~~~~
```

Added: 
    

Modified: 
    llvm/include/llvm/module.modulemap

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index 39f489d10d44..87986c811fda 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/include/llvm/module.modulemap
@@ -256,6 +256,7 @@ module LLVM_intrinsic_gen {
   module Analysis_PostDominators { header "Analysis/PostDominators.h" export * }
   module Analysis_DomTreeUpdater { header "Analysis/DomTreeUpdater.h" export * }
   module IR_IRBuilder { header "IR/IRBuilder.h" export * }
+  module IR_MatrixBuilder { header "IR/MatrixBuilder.h" export * }
   module IR_PassManager { header "IR/PassManager.h" export * }
   module IR_PassManagerImpl { header "IR/PassManagerImpl.h" export * }
   module IR_PredIteratorCache { header "IR/PredIteratorCache.h" export * }


        


More information about the llvm-commits mailing list