This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH 1/5] Libsanitizer: merge from trunk with merge.sh.
On Mon, Nov 04, 2019 at 04:10:27PM +0100, Martin Liska wrote:
>
> libsanitizer/ChangeLog:
>
> 2019-11-05 Martin Liska <mliska@suse.cz>
>
> * all source files: Merge from upstream r375507.
> ---
> libsanitizer/BlocksRuntime/Block.h | 59 +
> libsanitizer/BlocksRuntime/Block_private.h | 179 ++
Do we really need this?
> --- a/libsanitizer/tsan/tsan_libdispatch.cpp
> +++ b/libsanitizer/tsan/tsan_interceptors_libdispatch.cpp
> @@ -1,4 +1,4 @@
> -//===-- tsan_libdispatch.cpp ----------------------------------------------===//
> +//===-- tsan_interceptors_libdispatch.cpp ---------------------------------===//
> //
> // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
> // See https://llvm.org/LICENSE.txt for license information.
> @@ -16,6 +16,7 @@
> #include "tsan_interceptors.h"
> #include "tsan_rtl.h"
>
> +#include "BlocksRuntime/Block.h"
> #include "tsan_dispatch_defs.h"
>
> namespace __tsan {
I mean, couldn't we wrap this Block.h include with #ifdef __BLOCKS__ or so
as a local patch (at least for now)?
Otherwise the patch series LGTM.
Jakub