This is an archive of the discontinued LLVM Phabricator instance.

[Tsan] Do not use INTERCEPT_FUNCTION_VER() on FreeBSD
ClosedPublic

Authored by kutuzov.viktor.84 on Oct 9 2014, 12:03 PM.

Reviewers

Commits

kutuzov.viktor.84 retitled this revision from to [Tsan] Do not use INTERCEPT_FUNCTION_VER() on FreeBSD.

kutuzov.viktor.84 updated this object.

kutuzov.viktor.84 edited the test plan for this revision. (Show Details)

kutuzov.viktor.84 added subscribers: Unknown Object (MLST), emaste.

LGTM

lib/tsan/rtl/tsan_interceptors.cc
236	Please add indentation here #if SANITIZER_FREEBSD # define ... #else # define .. #endif

This revision is now accepted and ready to land.Oct 9 2014, 6:18 PM

Closed by commit rL219483 (authored by vkutuzov).

Path

Size

lib/

tsan/

rtl/

4 lines

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines	if (REAL(func) == 0) { \
Die(); \		Die(); \
} \		} \
if (thr->ignore_interceptors \|\| thr->in_ignored_lib) \		if (thr->ignore_interceptors \|\| thr->in_ignored_lib) \
return REAL(func)(__VA_ARGS__); \		return REAL(func)(__VA_ARGS__); \
/**/		/**/

#define TSAN_INTERCEPTOR(ret, func, ...) INTERCEPTOR(ret, func, __VA_ARGS__)		#define TSAN_INTERCEPTOR(ret, func, ...) INTERCEPTOR(ret, func, __VA_ARGS__)
#define TSAN_INTERCEPT(func) INTERCEPT_FUNCTION(func)		#define TSAN_INTERCEPT(func) INTERCEPT_FUNCTION(func)
		#if SANITIZER_FREEBSD
		#define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION(func)
		samsonovUnsubmitted Not Done Reply Inline Actions Please add indentation here #if SANITIZER_FREEBSD # define ... #else # define .. #endif samsonov: Please add indentation here #if SANITIZER_FREEBSD # define ... #else # define ..
		#else
#define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION_VER(func, ver)		#define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION_VER(func, ver)
		#endif

#define BLOCK_REAL(name) (BlockingCall(thr), REAL(name))		#define BLOCK_REAL(name) (BlockingCall(thr), REAL(name))

struct BlockingCall {		struct BlockingCall {
explicit BlockingCall(ThreadState *thr)		explicit BlockingCall(ThreadState *thr)
: thr(thr)		: thr(thr)
, ctx(SigCtx(thr)) {		, ctx(SigCtx(thr)) {
for (;;) {		for (;;) {
▲ Show 20 Lines • Show All 2,225 Lines • Show Last 20 Lines