Add dispatch_apply_f interceptor

Author: thetruestblue

compiler-rt/lib/asan/asan_mac.cpp

@@ -104,6 +104,7 @@ void FlushUnneededASanShadowMemory(uptr p, uptr size) {
 //   dispatch_group_async_f()
 //   dispatch_group_async()
 //   dispatch_apply()
+//   dispatch_apply_f()
 // TODO(glider): libdispatch API contains other functions that we don't support
 // yet.
 //
@@ -244,7 +245,24 @@ INTERCEPTOR(void, dispatch_group_async_f, dispatch_group_t group,
                                asan_dispatch_call_block_and_release);
 }
 
-#if !defined(MISSING_BLOCKS_SUPPORT)
+extern "C" void asan_dispatch_apply_f_block(void *context, size_t iteration) {
+  GET_STACK_TRACE_THREAD;
+  asan_block_context_t *asan_ctxt = (asan_block_context_t *)context;
+  asan_register_worker_thread(asan_ctxt->parent_tid, &stack);
+  ((void (*)(void *, size_t))asan_ctxt->func)(asan_ctxt->block, iteration);
+}
+
+INTERCEPTOR(void, dispatch_apply_f, size_t iterations, dispatch_queue_t queue,
+            void *ctxt, void (*work)(void *, size_t)) {
+  GET_STACK_TRACE_THREAD;
+  asan_block_context_t *asan_ctxt =
+      alloc_asan_context(ctxt, (dispatch_function_t)work, &stack);
+
+  REAL(dispatch_apply_f)
+  (iterations, queue, (void *)asan_ctxt, asan_dispatch_apply_f_block);
+}
+
+#  if !defined(MISSING_BLOCKS_SUPPORT)
 extern "C" {
 void dispatch_async(dispatch_queue_t dq, void(^work)(void));
 void dispatch_group_async(dispatch_group_t dg, dispatch_queue_t dq,

compiler-rt/test/asan/TestCases/Darwin/dispatch_apply_threadno.c

@@ -2,6 +2,9 @@
 // with an empty stack.
 // This tests that dispatch_apply blocks can capture valid thread number and stack.
 
+// RUN: %clang_asan -DDISPATCH_APPLY_F %s -o %t
+// RUN: not %run %t 2>&1 | FileCheck %s
+
 // RUN: %clang_asan %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
@@ -17,8 +20,27 @@ __attribute__((noinline)) void test_dispatch_apply() {
   });
 }
 
+typedef struct {
+  char *data;
+} Context;
+
+void da_func(void *ctx, size_t i) {
+  Context *c = (Context *)ctx;
+  access_memory_frame(&c->data[i]);
+}
+
+__attribute__((noinline)) void test_dispatch_apply_f() {
+  Context *ctx = (Context *)malloc(sizeof(Context));
+  ctx->data = (char *)malloc(4);
+  dispatch_apply_f(8, dispatch_get_global_queue(0, 0), ctx, da_func);
+}
+
 int main(int argc, const char *argv[]) {
+#if DISPATCH_APPLY_F
+  test_dispatch_apply_f();
+#else
   test_dispatch_apply();
+#endif
   return 0;
 }