Merge pull request #37747 from mikeash/fix-swift_task_enqueueGlobal_hook-5.5

tkremenek · web-flow · commit 85a448bad9ef · 2021-06-04T06:47:52.000-07:00
diff --git a/stdlib/public/Concurrency/GlobalExecutor.cpp b/stdlib/public/Concurrency/GlobalExecutor.cpp
@@ -336,7 +336,7 @@ static void swift_task_enqueueGlobalImpl(Job *job) {
 
 void swift::swift_task_enqueueGlobal(Job *job) {
   if (swift_task_enqueueGlobal_hook)
-    swift_task_enqueueGlobal_hook(job, swift_task_enqueueGlobal);
+    swift_task_enqueueGlobal_hook(job, swift_task_enqueueGlobalImpl);
   else
     swift_task_enqueueGlobalImpl(job);
 }

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ static void swift_task_enqueueGlobalImpl(Job *job) {`
`336`	`336`
`337`	`337`	`void swift::swift_task_enqueueGlobal(Job *job) {`
`338`	`338`	`if (swift_task_enqueueGlobal_hook)`
`339`		`- swift_task_enqueueGlobal_hook(job, swift_task_enqueueGlobal);`
	`339`	`+ swift_task_enqueueGlobal_hook(job, swift_task_enqueueGlobalImpl);`
`340`	`340`	`else`
`341`	`341`	`swift_task_enqueueGlobalImpl(job);`
`342`	`342`	`}`