Pass -module-path to EBM-enabled compile jobs

rdar://151822009

Author: adrian-prantl

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -108,6 +108,12 @@ extension Driver {
       jobNeedPathRemap = false
     }
 
+    if isPlanJobForExplicitModule && kind == .compile,
+       let explicitModulePlanner {
+      let mainModule = explicitModulePlanner.dependencyGraph.mainModule
+      try addPathOption(option: .modulePath, path: VirtualPath.lookup(mainModule.modulePath.path), to: &commandLine, remap: jobNeedPathRemap)
+    }
+
     // Check if dependency scanner has put the job into direct clang cc1 mode.
     // If dependency scanner put us into direct cc1 mode, avoid adding `-Xcc` options, since
     // dependency scanner already adds needed flags and -Xcc options known by swift-driver are

Sources/SwiftOptions/Options.swift

@@ -707,6 +707,8 @@ extension Option {
   public static let moduleLoadMode: Option = Option("-module-load-mode", .separate, attributes: [.helpHidden, .frontend, .noDriver], metaVar: "only-interface|prefer-interface|prefer-serialized|only-serialized", helpText: "Module loading mode")
   public static let moduleNameEQ: Option = Option("-module-name=", .joined, alias: Option.moduleName, attributes: [.frontend])
   public static let moduleName: Option = Option("-module-name", .separate, attributes: [.frontend, .synthesizeInterface, .moduleInterface], helpText: "Name of the module to build")
+  public static let modulePathEQ: Option = Option("-module-path=", .joined, alias: Option.modulePathEQ, attributes: [.frontend])
+  public static let modulePath: Option = Option("-module-path", .separate, attributes: [.frontend], helpText: "Path to this module's binary swiftmodule artifact (required by debug info)")
   public static let module: Option = Option("-module", .separate, attributes: [.noDriver], metaVar: "<name>", helpText: "Names of modules")
   public static let module_: Option = Option("--module", .separate, alias: Option.module, attributes: [.noDriver], metaVar: "<name>", helpText: "Names of modules")
   public static let newDriverPath: Option = Option("-new-driver-path", .separate, attributes: [.helpHidden, .frontend, .noDriver], metaVar: "<path>", helpText: "Path of the new driver to be used")
@@ -1694,6 +1696,8 @@ extension Option {
       Option.moduleLoadMode,
       Option.moduleNameEQ,
       Option.moduleName,
+      Option.modulePathEQ,
+      Option.modulePath,
       Option.module,
       Option.module_,
       Option.newDriverPath,

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -718,6 +718,10 @@ final class ExplicitModuleBuildTests: XCTestCase {
       for job in jobs {
         XCTAssertEqual(job.outputs.count, 1)
         let outputFilePath = job.outputs[0].file
+        if job.kind == .compile {
+          XCTAssertTrue(job.commandLine.contains(subsequence: ["-module-path", try toPathOption("testExplicitModuleBuildJobs.swiftmodule")]))
+
+        }
 
         // Swift dependencies
         if outputFilePath.extension != nil,