Revert "[tsan] Fix Darwin build after D106973"

vitalybuka · vitalybuka · commit d42a06b2006e · 2021-07-28T16:39:07.000-07:00
It was invalid fix. This reverts commit 6a0fe68.
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors_mac.cpp b/compiler-rt/lib/tsan/rtl/tsan_interceptors_mac.cpp
@@ -363,9 +363,9 @@ static uptr GetOrCreateSyncAddress(uptr addr, ThreadState *thr, uptr pc) {
   static Map Addresses;
   Map::Handle h(&Addresses, addr);
   if (h.created()) {
-    ThreadIgnoreBegin(thr, 0);
+    ThreadIgnoreBegin(thr, pc);
     *h = (uptr) user_alloc(thr, pc, /*size=*/1);
-    ThreadIgnoreEnd(thr);
+    ThreadIgnoreEnd(thr, pc);
   }
   return *h;
 }

Original file line number	Diff line number	Diff line change
`@@ -363,9 +363,9 @@ static uptr GetOrCreateSyncAddress(uptr addr, ThreadState *thr, uptr pc) {`
`363`	`363`	`static Map Addresses;`
`364`	`364`	`Map::Handle h(&Addresses, addr);`
`365`	`365`	`if (h.created()) {`
`366`		`- ThreadIgnoreBegin(thr, 0);`
	`366`	`+ ThreadIgnoreBegin(thr, pc);`
`367`	`367`	`h = (uptr) user_alloc(thr, pc, /size=*/1);`
`368`		`- ThreadIgnoreEnd(thr);`
	`368`	`+ ThreadIgnoreEnd(thr, pc);`
`369`	`369`	`}`
`370`	`370`	`return *h;`
`371`	`371`	`}`