[PATCH] D22232: [asan] Fix unittest Asan-x86_64-inline-Test crashing on Windows64

[Etienne Bergeron via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL275098: [compiler-rt] Refactor the interception code on windows. (authored by etienneb).

Changed prior to commit:
  http://reviews.llvm.org/D22232?vs=63559&id=63565#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D22232

Files:
  compiler-rt/trunk/lib/asan/asan_interceptors.cc

Index: compiler-rt/trunk/lib/asan/asan_interceptors.cc
===================================================================
--- compiler-rt/trunk/lib/asan/asan_interceptors.cc
+++ compiler-rt/trunk/lib/asan/asan_interceptors.cc
@@ -725,11 +725,13 @@
   InitializeCommonInterceptors();
 
   // Intercept mem* functions.
-  ASAN_INTERCEPT_FUNC(memmove);
+  ASAN_INTERCEPT_FUNC(memcpy);
   ASAN_INTERCEPT_FUNC(memset);
   if (PLATFORM_HAS_DIFFERENT_MEMCPY_AND_MEMMOVE) {
-    ASAN_INTERCEPT_FUNC(memcpy);
+    // In asan, REAL(memmove) is not used, but it is used in msan.
+    ASAN_INTERCEPT_FUNC(memmove);
   }
+  CHECK(REAL(memcpy));
 
   // Intercept str* functions.
   ASAN_INTERCEPT_FUNC(strcat);  // NOLINT


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D22232.63565.patch
Type: text/x-patch
Size: 710 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160711/08243506/attachment.bin>