This is an archive of the discontinued LLVM Phabricator instance.

tsan: tidy up SCOPED_INTERCEPTOR_RAW
ClosedPublic

Authored by dvyukov on Oct 26 2021, 7:57 AM.

Reviewers

vitalybuka
melver

Commits

rGabdefea6a21a: tsan: tidy up SCOPED_INTERCEPTOR_RAW

Summary

Don't leak caller_pc var from the macro
(it's not supposed to be used by interceptors).
Use UNUSED instead of (void) cast.

Depends on D112540.

dvyukov requested review of this revision.Oct 26 2021, 7:57 AM

dvyukov created this revision.

Herald added a subscriber: Restricted Project. · View Herald Transcript

This revision is now accepted and ready to land.Oct 26 2021, 8:03 AM

This revision was landed with ongoing or failed builds.Oct 26 2021, 11:47 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

compiler-rt/

lib/

tsan/

rtl/

10 lines

	Show All 32 Lines
	#if !SANITIZER_GO			#if !SANITIZER_GO
	inline bool in_symbolizer() {			inline bool in_symbolizer() {
	return UNLIKELY(cur_thread_init()->in_symbolizer);			return UNLIKELY(cur_thread_init()->in_symbolizer);
	}			}
	#endif			#endif

	} // namespace __tsan			} // namespace __tsan

	#define SCOPED_INTERCEPTOR_RAW(func, ...) \			#define SCOPED_INTERCEPTOR_RAW(func, ...) \
	ThreadState *thr = cur_thread_init(); \			ThreadState *thr = cur_thread_init(); \
	const uptr caller_pc = GET_CALLER_PC(); \			ScopedInterceptor si(thr, #func, GET_CALLER_PC()); \
	ScopedInterceptor si(thr, #func, caller_pc); \			UNUSED const uptr pc = GET_CURRENT_PC();
	const uptr pc = GET_CURRENT_PC(); \
	(void)pc;

	#define SCOPED_TSAN_INTERCEPTOR(func, ...) \			#define SCOPED_TSAN_INTERCEPTOR(func, ...) \
	SCOPED_INTERCEPTOR_RAW(func, __VA_ARGS__); \			SCOPED_INTERCEPTOR_RAW(func, __VA_ARGS__); \
	DCHECK(REAL(func)); \			DCHECK(REAL(func)); \
	if (!thr->is_inited \|\| thr->ignore_interceptors \|\| thr->in_ignored_lib) \			if (!thr->is_inited \|\| thr->ignore_interceptors \|\| thr->in_ignored_lib) \
	return REAL(func)(__VA_ARGS__);			return REAL(func)(__VA_ARGS__);

	#define SCOPED_TSAN_INTERCEPTOR_USER_CALLBACK_START() \			#define SCOPED_TSAN_INTERCEPTOR_USER_CALLBACK_START() \
	Show All 24 Lines