From 22d1a2789a752dce0244666a248e353d797b70ee Mon Sep 17 00:00:00 2001 From: Kuba Mracek Date: Tue, 21 Aug 2018 22:03:28 +0000 Subject: [PATCH] Fixup for r340342: Avoid Block_release'ing the block since we're no longer making a copy. rdar://problem/42242579 llvm-svn: 340347 --- compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc b/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc index 23c4380..df22888 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc @@ -186,7 +186,7 @@ static void invoke_and_release_block(void *param) { DISPATCH_NOESCAPE dispatch_block_t block) { \ SCOPED_TSAN_INTERCEPTOR(name, q, block); \ tsan_block_context_t new_context = { \ - q, block, &invoke_and_release_block, false, true, barrier, 0}; \ + q, block, &invoke_block, false, true, barrier, 0}; \ Release(thr, pc, (uptr)&new_context); \ SCOPED_TSAN_INTERCEPTOR_USER_CALLBACK_START(); \ REAL(name##_f)(q, &new_context, dispatch_callback_wrap); \ -- 2.7.4