Merge pull request #1591 from cachemeifyoucan/eng/PR-fix-continuation-misuse

cachemeifyoucan · web-flow · commit b385bbfbf33d · 2024-05-02T13:40:14.000-07:00
[CAS] Fix task continuation misuse when CAS error happens
diff --git a/Sources/SwiftDriver/SwiftScan/SwiftScanCAS.swift b/Sources/SwiftDriver/SwiftScan/SwiftScanCAS.swift
@@ -344,8 +344,9 @@ extension CachedOutput {
         } else {
           obj.continuation.resume(throwing: DependencyScanningError.casError("unknown output loading error"))
         }
+      } else {
+        obj.continuation.resume(returning: success)
       }
-      obj.continuation.resume(returning: success)
     }
 
     return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Bool, Swift.Error>) in
@@ -378,8 +379,9 @@ extension SwiftScanCAS {
         } else {
           obj.continuation.resume(throwing: DependencyScanningError.casError("unknown cache querying error"))
         }
+      } else {
+        obj.continuation.resume(returning: obj.cas.convert(compilation: comp))
       }
-      obj.continuation.resume(returning: obj.cas.convert(compilation: comp))
     }
 
     return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<CachedCompilation?, Swift.Error>) in
@@ -410,8 +412,9 @@ extension SwiftScanCAS {
         } else {
           obj.continuation.resume(throwing: DependencyScanningError.casError("unknown output loading error"))
         }
+      } else {
+        obj.continuation.resume(returning: success)
       }
-      obj.continuation.resume(returning: success)
     }
 
     return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Bool, Swift.Error>) in

Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,9 @@ extension CachedOutput {`
`344`	`344`	`} else {`
`345`	`345`	`obj.continuation.resume(throwing: DependencyScanningError.casError("unknown output loading error"))`
`346`	`346`	`}`
	`347`	`+ } else {`
	`348`	`+ obj.continuation.resume(returning: success)`
`347`	`349`	`}`
`348`		`- obj.continuation.resume(returning: success)`
`349`	`350`	`}`
`350`	`351`
`351`	`352`	`return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Bool, Swift.Error>) in`
`@@ -378,8 +379,9 @@ extension SwiftScanCAS {`
`378`	`379`	`} else {`
`379`	`380`	`obj.continuation.resume(throwing: DependencyScanningError.casError("unknown cache querying error"))`
`380`	`381`	`}`
	`382`	`+ } else {`
	`383`	`+ obj.continuation.resume(returning: obj.cas.convert(compilation: comp))`
`381`	`384`	`}`
`382`		`- obj.continuation.resume(returning: obj.cas.convert(compilation: comp))`
`383`	`385`	`}`
`384`	`386`
`385`	`387`	`return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<CachedCompilation?, Swift.Error>) in`
`@@ -410,8 +412,9 @@ extension SwiftScanCAS {`
`410`	`412`	`} else {`
`411`	`413`	`obj.continuation.resume(throwing: DependencyScanningError.casError("unknown output loading error"))`
`412`	`414`	`}`
	`415`	`+ } else {`
	`416`	`+ obj.continuation.resume(returning: success)`
`413`	`417`	`}`
`414`		`- obj.continuation.resume(returning: success)`
`415`	`418`	`}`
`416`	`419`
`417`	`420`	`return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Bool, Swift.Error>) in`