Merge pull request #656 from artemcm/CherryPickEmitModuleCompatFix

airspeedswift · web-flow · commit 6d74c9514327 · 2021-05-13T07:33:52.000-07:00
[5.5] [NFC] Small fix to `emitModuleJob` for compatibility with &lt;=5.3 compilers.
diff --git a/Sources/SwiftDriver/Jobs/Planning.swift b/Sources/SwiftDriver/Jobs/Planning.swift
@@ -177,9 +177,9 @@ extension Driver {
 
   private mutating func addEmitModuleJob(addJobBeforeCompiles: (Job) -> Void, addJobAfterCompiles: (Job) -> Void) throws {
     if shouldCreateEmitModuleJob {
-      let emitModuleJob = try emitModuleJob()
-      addJobBeforeCompiles(emitModuleJob)
-      try addVerifyJobs(emitModuleJob: emitModuleJob, addJob: addJobAfterCompiles)
+      let emitJob = try emitModuleJob()
+      addJobBeforeCompiles(emitJob)
+      try addVerifyJobs(emitModuleJob: emitJob, addJob: addJobAfterCompiles)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -177,9 +177,9 @@ extension Driver {`
`177`	`177`
`178`	`178`	`private mutating func addEmitModuleJob(addJobBeforeCompiles: (Job) -> Void, addJobAfterCompiles: (Job) -> Void) throws {`
`179`	`179`	`if shouldCreateEmitModuleJob {`
`180`		`- let emitModuleJob = try emitModuleJob()`
`181`		`- addJobBeforeCompiles(emitModuleJob)`
`182`		`- try addVerifyJobs(emitModuleJob: emitModuleJob, addJob: addJobAfterCompiles)`
	`180`	`+ let emitJob = try emitModuleJob()`
	`181`	`+ addJobBeforeCompiles(emitJob)`
	`182`	`+ try addVerifyJobs(emitModuleJob: emitJob, addJob: addJobAfterCompiles)`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`