Merge pull request swiftlang#77306 from swiftlang/fix-getTaskId

mikeash · web-flow · commit fcdec961b022 · 2024-11-04T20:03:19.000-05:00
[Concurrency] Fix getTaskId.
diff --git a/stdlib/public/Concurrency/Task.cpp b/stdlib/public/Concurrency/Task.cpp
@@ -346,7 +346,7 @@ void AsyncTask::setTaskId() {
 uint64_t AsyncTask::getTaskId() {
   // Reconstitute a full 64-bit task ID from the 32-bit job ID and the upper
   // 32 bits held in _private().
-  return (uint64_t)Id << _private().Id;
+  return ((uint64_t)_private().Id << 32) | (uint64_t)Id;
 }
 
 SWIFT_CC(swift)

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ void AsyncTask::setTaskId() {`
`346`	`346`	`uint64_t AsyncTask::getTaskId() {`
`347`	`347`	`// Reconstitute a full 64-bit task ID from the 32-bit job ID and the upper`
`348`	`348`	`// 32 bits held in _private().`
`349`		`- return (uint64_t)Id << _private().Id;`
	`349`	`+ return ((uint64_t)_private().Id << 32) \| (uint64_t)Id;`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`SWIFT_CC(swift)`