Index: include/llvm/module.modulemap
===================================================================
--- include/llvm/module.modulemap
+++ include/llvm/module.modulemap
@@ -120,6 +120,29 @@
   module PassRegistry { header "PassRegistry.h" export * }
   module InitializePasses { header "InitializePasses.h" export * }
 
+  module LLVM_Intrinsics_gen_IR {
+    requires cplusplus
+
+    // Delay building the modules containing dependencies to Attributes.h and
+    // Intrinsics.h because they need to be generated by tablegen first.
+
+    // Attributes.h
+    module IR_Argument { header "IR/Argument.h" export * }
+    module IR_CallSite { header "IR/CallSite.h" export * }
+    module IR_Function { header "IR/Function.h" export * }
+    module IR_InstrTypes { header "IR/InstrTypes.h" export * }
+    module IR_Instructions { header "IR/Instructions.h" export * }
+
+    // Intrinsics.h
+    module IR_IRBuilder { header "IR/IRBuilder.h" export * }
+    module IR_InstVisitor { header "IR/InstVisitor.h" export * }
+    module IR_IntrinsicInst { header "IR/IntrinsicInst.h" export * }
+    module IR_PatternMatch { header "IR/PatternMatch.h" export * }
+    module IR_Statepoint { header "IR/Statepoint.h" export * }
+
+    export *
+  }
+
   umbrella "IR"
   module * { export * }