Merge pull request #81196 from al45tair/eng/PR-150290165-6.2

al45tair · web-flow · commit e767e7f705aa · 2025-05-04T18:32:01.000+01:00
[Concurrency] Fix copy-paste error.
diff --git a/stdlib/public/Concurrency/DispatchGlobalExecutor.cpp b/stdlib/public/Concurrency/DispatchGlobalExecutor.cpp
@@ -343,7 +343,7 @@ void swift_dispatchEnqueueWithDeadline(bool global,
   if (tnsec != -1) {
     uint64_t leeway;
     if (__builtin_mul_overflow(tsec, NSEC_PER_SEC, &leeway)
-        || __builtin_add_overflow(tnsec, deadline, &leeway)) {
+        || __builtin_add_overflow(tnsec, leeway, &leeway)) {
       leeway = UINT64_MAX;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ void swift_dispatchEnqueueWithDeadline(bool global,`
`343`	`343`	`if (tnsec != -1) {`
`344`	`344`	`uint64_t leeway;`
`345`	`345`	`if (__builtin_mul_overflow(tsec, NSEC_PER_SEC, &leeway)`
`346`		`- \|\| __builtin_add_overflow(tnsec, deadline, &leeway)) {`
	`346`	`+ \|\| __builtin_add_overflow(tnsec, leeway, &leeway)) {`
`347`	`347`	`leeway = UINT64_MAX;`
`348`	`348`	`}`
`349`	`349`