This is an archive of the discontinued LLVM Phabricator instance.

Differential D116818

scudo: fix thread-safety macro name
ClosedPublic

Authored by dvyukov on Jan 7 2022, 9:27 AM.

Details

Reviewers
vitalybuka
paulkirth
Commits
rGd7986bf0111e: scudo: fix thread-safety macro name
Summary

Missed in 765921de5b ("sanitizer_common: prefix thread-safety macros with SANITIZER_") update.

Diff Detail

Event Timeline

dvyukov requested review of this revision.Jan 7 2022, 9:27 AM
dvyukov created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 7 2022, 9:27 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
dvyukov mentioned this in D116652: sanitizer_common: prefix thread-safety macros with SANITIZER_.Jan 7 2022, 9:28 AM
This revision was not accepted when it landed; it landed in state Needs Review.Jan 7 2022, 9:28 AM
This revision was landed with ongoing or failed builds.
Closed by commit rGd7986bf0111e: scudo: fix thread-safety macro name (authored by dvyukov). · Explain Why
This revision was automatically updated to reflect the committed changes.
dvyukov added a commit: rGd7986bf0111e: scudo: fix thread-safety macro name.
paulkirth added a comment.Jan 7 2022, 9:30 AM

Thanks for the quick fix.

Harbormaster completed remote builds in B142106: Diff 398173.Jan 7 2022, 9:46 AM
vitalybuka reopened this revision.Jan 7 2022, 12:12 PM
vitalybuka accepted this revision.
This revision is now accepted and ready to land.Jan 7 2022, 12:12 PM
vitalybuka closed this revision.Jan 7 2022, 12:12 PM

Revision Contents

PathSize
compiler-rt/
lib/
scudo/
2 lines

Diff 398175

compiler-rt/lib/scudo/scudo_tsd_shared.inc

Show All 36 LinesALWAYS_INLINE void initThreadMaybe(bool MinimalInit = false) {
if (LIKELY(getCurrentTSD())) if (LIKELY(getCurrentTSD()))
return; return;
initThread(MinimalInit); initThread(MinimalInit);
} }
ScudoTSD *getTSDAndLockSlow(ScudoTSD *TSD); ScudoTSD *getTSDAndLockSlow(ScudoTSD *TSD);
ALWAYS_INLINE ScudoTSD * ALWAYS_INLINE ScudoTSD *
getTSDAndLock(bool *UnlockRequired) NO_THREAD_SAFETY_ANALYSIS { getTSDAndLock(bool *UnlockRequired) SANITIZER_NO_THREAD_SAFETY_ANALYSIS {
ScudoTSD *TSD = getCurrentTSD(); ScudoTSD *TSD = getCurrentTSD();
DCHECK(TSD && "No TSD associated with the current thread!"); DCHECK(TSD && "No TSD associated with the current thread!");
*UnlockRequired = true; *UnlockRequired = true;
// Try to lock the currently associated context. // Try to lock the currently associated context.
if (TSD->tryLock()) if (TSD->tryLock())
return TSD; return TSD;
// If it failed, go the slow path. // If it failed, go the slow path.
return getTSDAndLockSlow(TSD); return getTSDAndLockSlow(TSD);
} }
#endif // !SCUDO_TSD_EXCLUSIVE #endif // !SCUDO_TSD_EXCLUSIVE