Revert r246961 "[asan] Intercept and wrap XPC callback blocks".

There is a build failure for the simulator.

llvm-svn: 246967

2 files changed, 9 insertions, 82 deletions

diff --git a/compiler-rt/lib/asan/asan_mac.cc b/compiler-rt/lib/asan/asan_mac.cc
index 3224db8bea5..0f0f9bb0875 100644
--- a/compiler-rt/lib/asan/asan_mac.cc
+++ b/compiler-rt/lib/asan/asan_mac.cc
@@ -33,18 +33,17 @@ extern "C" {
 #endif
 
 #include <dlfcn.h>  // for dladdr()
-#include <fcntl.h>
-#include <libkern/OSAtomic.h>
 #include <mach-o/dyld.h>
 #include <mach-o/loader.h>
-#include <pthread.h>
-#include <stdlib.h>  // for free()
 #include <sys/mman.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/ucontext.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdlib.h>  // for free()
 #include <unistd.h>
-#include <xpc/xpc.h>
+#include <libkern/OSAtomic.h>
 
 namespace __asan {
 
@@ -273,6 +272,11 @@ void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
 // The implementation details are at
 //   http://libdispatch.macosforge.org/trac/browser/trunk/src/queue.c
 
+typedef void* dispatch_group_t;
+typedef void* dispatch_queue_t;
+typedef void* dispatch_source_t;
+typedef u64 dispatch_time_t;
+typedef void (*dispatch_function_t)(void *block);
 typedef void* (*worker_t)(void *block);
 
 // A wrapper for the ObjC blocks used to support libdispatch.
@@ -395,15 +399,6 @@ void dispatch_source_set_event_handler(dispatch_source_t ds, void(^work)(void));
     work(); \
   }
 
-#define GET_ASAN_BLOCK_XPC(work) \
-  void (^asan_block)(xpc_object_t object);  \
-  int parent_tid = GetCurrentTidOrInvalid(); \
-  asan_block = ^(xpc_object_t object) { \
-    GET_STACK_TRACE_THREAD; \
-    asan_register_worker_thread(parent_tid, &stack); \
-    work(object); \
-  }
-
 INTERCEPTOR(void, dispatch_async,
             dispatch_queue_t dq, void(^work)(void)) {
   ENABLE_FRAME_POINTER;
@@ -442,37 +437,6 @@ INTERCEPTOR(void, dispatch_source_set_event_handler,
   GET_ASAN_BLOCK(work);
   REAL(dispatch_source_set_event_handler)(ds, asan_block);
 }
-
-INTERCEPTOR(void, xpc_connection_send_message_with_reply,
-            xpc_connection_t connection, xpc_object_t message,
-            dispatch_queue_t replyq, xpc_handler_t handler) {
-  ENABLE_FRAME_POINTER;
-  GET_ASAN_BLOCK_XPC(handler);
-  REAL(xpc_connection_send_message_with_reply)(connection, message, replyq,
-                                               asan_block);
-}
-
-INTERCEPTOR(void, xpc_connection_set_event_handler, xpc_connection_t connection,
-            xpc_handler_t handler) {
-  ENABLE_FRAME_POINTER;
-  GET_ASAN_BLOCK_XPC(handler);
-  REAL(xpc_connection_set_event_handler)(connection, asan_block);
-}
-
-INTERCEPTOR(void, xpc_set_event_stream_handler, const char *stream,
-            dispatch_queue_t targetq, xpc_handler_t handler) {
-  ENABLE_FRAME_POINTER;
-  GET_ASAN_BLOCK_XPC(handler);
-  REAL(xpc_set_event_stream_handler)(stream, targetq, asan_block);
-}
-
-INTERCEPTOR(void, xpc_connection_send_barrier, xpc_connection_t connection,
-            dispatch_block_t barrier) {
-  ENABLE_FRAME_POINTER;
-  GET_ASAN_BLOCK(barrier);
-  REAL(xpc_connection_send_barrier)(connection, asan_block);
-}
-
 #endif
 
 #endif  // SANITIZER_MAC
diff --git a/compiler-rt/test/asan/TestCases/Darwin/xpc_interceptors.mm b/compiler-rt/test/asan/TestCases/Darwin/xpc_interceptors.mm
deleted file mode 100644
index 9872419b19b..00000000000
--- a/compiler-rt/test/asan/TestCases/Darwin/xpc_interceptors.mm
+++ /dev/null
@@ -1,37 +0,0 @@
-// Check that blocks executed on the XPC callback queue are handled correctly by
-// ASan.
-
-// RUN: %clangxx_asan -O0 %s -o %t -framework Foundation && not %run %t 2>&1 | FileCheck %s
-
-#import <Foundation/Foundation.h>
-#include <sanitizer/asan_interface.h>
-#include <xpc/xpc.h>
-
-int main() {
-  // Set up a 5-second timeout.
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC),
-                 dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
-                 ^{
-                   exit(0);
-                 });
-
-  xpc_connection_t _connection = xpc_connection_create_mach_service(
-      "com.example.non.existing.xpc", NULL, 0);
-
-  xpc_connection_set_event_handler(_connection, ^(xpc_object_t event) {
-    char *mem = (char *)malloc(10);
-    NSLog(@"mem = %p", mem);
-
-    // Without the XPC API interceptors, this would cause an assertion failure
-    // when describing the current thread (XPC callback thread).
-    fprintf(stderr, "%s\n", mem + 10);  // BOOM.
-    // CHECK: ERROR: AddressSanitizer: heap-buffer-overflow
-    // CHECK: READ of size 1 at
-    // CHECK: allocated by thread
-    // CHECK: {{    #0 0x.* in .*malloc}}
-  });
-
-  xpc_connection_resume(_connection);
-  dispatch_main();
-  return 0;
-}