This is an archive of the discontinued LLVM Phabricator instance.

[sanitizer] Support SANITIZER_INTERCEPTOR_HOOKS on Darwin
ClosedPublic

Authored by bogner on Jan 31 2017, 3:40 PM.

Download Raw Diff

Details

Reviewers

kcc
dcoughlin
kubamracek

Summary

This basically already worked other than weak symbols needing definitions on darwin.

Diff Detail

Event Timeline

bogner created this revision.Jan 31 2017, 3:40 PM

Herald added a subscriber: mcrosier. · View Herald TranscriptJan 31 2017, 3:40 PM

please move sanitizer_common/TestCases/Linux/weak_hook_test.cc to ./sanitizer_common/TestCases/Posix/
and make sure that it works (and fails w/o you change)

Moved the weak_hook_test to run for all posix platforms

kcc added inline comments.Jan 31 2017, 4:50 PM

lib/sanitizer_common/sanitizer_common_interceptors.inc
49	Why did you remove the 'if'?

bogner added inline comments.Jan 31 2017, 5:09 PM

lib/sanitizer_common/sanitizer_common_interceptors.inc
49	SANITIZER_INTERFACE_WEAK_DEF defines an empty default definition, so it would always be true.

LGTM, please watch the bots.

This revision is now accepted and ready to land.Jan 31 2017, 5:11 PM

Committed in r293741.

Revision Contents

Path

Size

lib/

sanitizer_common/

sanitizer_common_interceptors.inc

12 lines

sanitizer_platform_interceptors.h

2 lines

Diff 86512

lib/sanitizer_common/sanitizer_common_interceptors.inc

Context not available.
	#include <stdarg.h>	#include <stdarg.h>

	#if SANITIZER_INTERCEPTOR_HOOKS	#if SANITIZER_INTERCEPTOR_HOOKS
	#define CALL_WEAK_INTERCEPTOR_HOOK(f, ...) \	#define CALL_WEAK_INTERCEPTOR_HOOK(f, ...) f(__VA_ARGS__);
	do { \	#define DECLARE_WEAK_INTERCEPTOR_HOOK(f, ...) \
	if (f) \	SANITIZER_INTERFACE_WEAK_DEF(void, f, __VA_ARGS__) {}
	kccUnsubmitted Not Done Reply Inline Actions Why did you remove the 'if'? kcc: Why did you remove the 'if'?
	bognerAuthorUnsubmitted Not Done Reply Inline Actions SANITIZER_INTERFACE_WEAK_DEF defines an empty default definition, so it would always be true. bogner: SANITIZER_INTERFACE_WEAK_DEF defines an empty default definition, so it would always be true.
	f(__VA_ARGS__); \
	} while (false);
	#define DECLARE_WEAK_INTERCEPTOR_HOOK(f, ...) \
	extern "C" { \
	SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void f(__VA_ARGS__); \
	} // extern "C"
	#else	#else
	#define DECLARE_WEAK_INTERCEPTOR_HOOK(f, ...)	#define DECLARE_WEAK_INTERCEPTOR_HOOK(f, ...)
	#define CALL_WEAK_INTERCEPTOR_HOOK(f, ...)	#define CALL_WEAK_INTERCEPTOR_HOOK(f, ...)
Context not available.

lib/sanitizer_common/sanitizer_platform_interceptors.h

Context not available.
	#define SANITIZER_INTERCEPT_CTERMID SI_LINUX \|\| SI_MAC \|\| SI_FREEBSD	#define SANITIZER_INTERCEPT_CTERMID SI_LINUX \|\| SI_MAC \|\| SI_FREEBSD
	#define SANITIZER_INTERCEPT_CTERMID_R SI_MAC \|\| SI_FREEBSD	#define SANITIZER_INTERCEPT_CTERMID_R SI_MAC \|\| SI_FREEBSD

	#define SANITIZER_INTERCEPTOR_HOOKS SI_LINUX	#define SANITIZER_INTERCEPTOR_HOOKS SI_LINUX \|\| SI_MAC
	#define SANITIZER_INTERCEPT_RECV_RECVFROM SI_NOT_WINDOWS	#define SANITIZER_INTERCEPT_RECV_RECVFROM SI_NOT_WINDOWS
	#define SANITIZER_INTERCEPT_SEND_SENDTO SI_NOT_WINDOWS	#define SANITIZER_INTERCEPT_SEND_SENDTO SI_NOT_WINDOWS
	#define SANITIZER_INTERCEPT_EVENTFD_READ_WRITE SI_LINUX	#define SANITIZER_INTERCEPT_EVENTFD_READ_WRITE SI_LINUX
Context not available.