[compiler-rt] r369165 - Revert "[TSan] Don't guard #include <xpc/xpc.h>"
Julian Lettner via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 16 15:58:13 PDT 2019
Author: yln
Date: Fri Aug 16 15:58:13 2019
New Revision: 369165
URL: http://llvm.org/viewvc/llvm-project?rev=369165&view=rev
Log:
Revert "[TSan] Don't guard #include <xpc/xpc.h>"
This reverts commit 8191585b36eb4963002cce43fb2e79e7fb05c3d6.
Modified:
compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors_mac.cpp
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors_mac.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors_mac.cpp?rev=369165&r1=369164&r2=369165&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors_mac.cpp (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors_mac.cpp Fri Aug 16 15:58:13 2019
@@ -24,7 +24,10 @@
#include <libkern/OSAtomic.h>
#include <objc/objc-sync.h>
#include <sys/ucontext.h>
+
+#if defined(__has_include) && __has_include(<xpc/xpc.h>)
#include <xpc/xpc.h>
+#endif // #if defined(__has_include) && __has_include(<xpc/xpc.h>)
typedef long long_t; // NOLINT
@@ -296,6 +299,8 @@ TSAN_INTERCEPTOR(void, os_unfair_lock_un
REAL(os_unfair_lock_unlock)(lock);
}
+#if defined(__has_include) && __has_include(<xpc/xpc.h>)
+
TSAN_INTERCEPTOR(void, xpc_connection_set_event_handler,
xpc_connection_t connection, xpc_handler_t handler) {
SCOPED_TSAN_INTERCEPTOR(xpc_connection_set_event_handler, connection,
@@ -348,6 +353,8 @@ TSAN_INTERCEPTOR(void, xpc_connection_ca
REAL(xpc_connection_cancel)(connection);
}
+#endif // #if defined(__has_include) && __has_include(<xpc/xpc.h>)
+
// Determines whether the Obj-C object pointer is a tagged pointer. Tagged
// pointers encode the object data directly in their pointer bits and do not
// have an associated memory allocation. The Obj-C runtime uses tagged pointers
More information about the llvm-commits
mailing list