Merge commit 'c6a93fe80b3c' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit ea588880925b · 2024-03-12T18:25:36.000-07:00
diff --git a/libc/src/__support/GPU/utils.h b/libc/src/__support/GPU/utils.h
@@ -23,7 +23,7 @@ namespace LIBC_NAMESPACE {
 namespace gpu {
 /// Get the first active thread inside the lane.
 LIBC_INLINE uint64_t get_first_lane_id(uint64_t lane_mask) {
-  return __builtin_ffsl(lane_mask) - 1;
+  return __builtin_ffsll(lane_mask) - 1;
 }
 
 /// Conditional that is only true for a single thread in a lane.

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace LIBC_NAMESPACE {`
`23`	`23`	`namespace gpu {`
`24`	`24`	`/// Get the first active thread inside the lane.`
`25`	`25`	`LIBC_INLINE uint64_t get_first_lane_id(uint64_t lane_mask) {`
`26`		`- return __builtin_ffsl(lane_mask) - 1;`
	`26`	`+ return __builtin_ffsll(lane_mask) - 1;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/// Conditional that is only true for a single thread in a lane.`