Apply feedback -- don't recompile test file, change callback function name.

Author: thetruestblue

compiler-rt/lib/asan/asan_mac.cpp

@@ -245,7 +245,7 @@ INTERCEPTOR(void, dispatch_group_async_f, dispatch_group_t group,
                                asan_dispatch_call_block_and_release);
 }
 
-extern "C" void asan_dispatch_apply_f_block(void *context, size_t iteration) {
+extern "C" void asan_dispatch_apply_f_work(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);
@@ -257,9 +257,8 @@ INTERCEPTOR(void, dispatch_apply_f, size_t iterations, dispatch_queue_t queue,
   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);
+  REAL(dispatch_apply_f)(iterations, queue, (void *)asan_ctxt,
+                         asan_dispatch_apply_f_work);
 }
 
 #  if !defined(MISSING_BLOCKS_SUPPORT)
@@ -269,13 +268,13 @@ void dispatch_group_async(dispatch_group_t dg, dispatch_queue_t dq,
                           void(^work)(void));
 void dispatch_after(dispatch_time_t when, dispatch_queue_t queue,
                     void(^work)(void));
+void dispatch_apply(size_t iterations, dispatch_queue_t queue,
+                    void (^block)(size_t iteration));
 void dispatch_source_set_cancel_handler(dispatch_source_t ds,
                                         void(^work)(void));
 void dispatch_source_set_event_handler(dispatch_source_t ds, void(^work)(void));
 dispatch_mach_t dispatch_mach_create(const char *label, dispatch_queue_t queue,
                                      dispatch_mach_handler_t handler);
-void dispatch_apply(size_t iterations, dispatch_queue_t queue,
-                    void (^block)(size_t iteration));
 }
 
 #define GET_ASAN_BLOCK(work) \

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

@@ -2,13 +2,12 @@
 // 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
+// RUN: not %run %t func 2>&1 | FileCheck %s --check-prefixes=CHECK-FUNC,CHECK
+// RUN: not %run %t block 2>&1 | FileCheck %s --check-prefixes=CHECK-BLOCK,CHECK
 
 #include <dispatch/dispatch.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 __attribute__((noinline)) void access_memory_frame(char *x) { *x = 0; }
@@ -36,14 +35,20 @@ __attribute__((noinline)) void test_dispatch_apply_f() {
 }
 
 int main(int argc, const char *argv[]) {
-#if DISPATCH_APPLY_F
-  test_dispatch_apply_f();
-#else
-  test_dispatch_apply();
-#endif
+  if (strcmp(argv[1], "func") == 0) {
+    fprintf(stderr, "Test dispatch_apply with function\n");
+    // CHECK-FUNC: dispatch_apply with function
+    test_dispatch_apply_f();
+  } else if (strcmp(argv[1], "block") == 0) {
+    fprintf(stderr, "Test dispatch_apply with block\n");
+    // CHECK-BLOCK: dispatch_apply with block
+    test_dispatch_apply();
+  } else {
+    abort();
+  }
   return 0;
 }
 
 // CHECK: ERROR: AddressSanitizer: heap-buffer-overflow
 // CHECK: #0 0x{{.*}} in {{.*}}access_memory_frame
-// CHECK-NOT: T-1
+// CHECK-NOT: T-1