[compiler-rt] r276324 - [compiler-rt] Fix interception of memcpy/memmove on win64

[Bruno Cardoso Lopes via llvm-commits]

Hi Etienne,

On Thu, Jul 21, 2016 at 12:49 PM, Etienne Bergeron via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: etienneb
> Date: Thu Jul 21 14:49:11 2016
> New Revision: 276324
>
> URL: http://llvm.org/viewvc/llvm-project?rev=276324&view=rev
> Log:
> [compiler-rt] Fix interception of memcpy/memmove on win64
>
> Summary:
> This patch is fixing running interception unittests for memcpy/memmove on
> windows 64.
>
> Reviewers: rnk
>
> Subscribers: llvm-commits, wang0109, kubabrecka, chrisha
>
> Differential Revision: https://reviews.llvm.org/D22641
>
> Modified:
>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
>     compiler-rt/trunk/test/asan/TestCases/Windows/intercept_memcpy.cc
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=276324&r1=276323&r2=276324&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Thu Jul 21 14:49:11 2016
> @@ -663,7 +663,12 @@ INTERCEPTOR(void*, memchr, const void *s
>      return internal_memchr(s, c, n);
>    void *ctx;
>    COMMON_INTERCEPTOR_ENTER(ctx, memchr, s, c, n);
> -  void *res = REAL(memchr)(s, c, n);
> +  void *res;
> +  if (REAL(memchr)) {

This is causing a warning when using recent clang (which I tried to
fix but failed in r276539). Since you are more familiar with the code
in question, can you fix it? :-)

Thanks,

-- 
Bruno Cardoso Lopes
http://www.brunocardoso.cc