[compiler-rt][TSan] Fix TSan compile error on Android (#162369)

airpfei · web-flow · commit 5f7dc8ad11c0 · 2025-10-07T13:59:44.000-07:00
diff --git a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp
@@ -680,7 +680,8 @@ ThreadState *cur_thread() {
   // significant bit of TLS_SLOT_SANITIZER to 1. Scudo allocator uses this bit
   // as a flag to disable memory initialization. This is a workaround to get the
   // correct ThreadState pointer.
-  reinterpret_cast<ThreadState*>(addr & ~1ULL);
+  uptr addr = reinterpret_cast<uptr>(thr);
+  return reinterpret_cast<ThreadState*>(addr & ~1ULL);
 }
 
 void set_cur_thread(ThreadState *thr) {

Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,8 @@ ThreadState *cur_thread() {`
`680`	`680`	`// significant bit of TLS_SLOT_SANITIZER to 1. Scudo allocator uses this bit`
`681`	`681`	`// as a flag to disable memory initialization. This is a workaround to get the`
`682`	`682`	`// correct ThreadState pointer.`
`683`		`- reinterpret_cast<ThreadState*>(addr & ~1ULL);`
	`683`	`+ uptr addr = reinterpret_cast<uptr>(thr);`
	`684`	`+ return reinterpret_cast<ThreadState*>(addr & ~1ULL);`
`684`	`685`	`}`
`685`	`686`
`686`	`687`	`void set_cur_thread(ThreadState *thr) {`