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

[Wang Wei via llvm-commits]

wang0109 updated this revision to Diff 63552.
wang0109 added a comment.

- update diff: assert success of intercepting memcopy()


http://reviews.llvm.org/D22232

Files:
  lib/asan/asan_interceptors.cc

Index: lib/asan/asan_interceptors.cc
===================================================================
--- lib/asan/asan_interceptors.cc
+++ lib/asan/asan_interceptors.cc
@@ -725,11 +725,14 @@
   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);
+    // FIXME(wwchrome): REAL(memmove) may be nullptr, if the following line is
+    // skipped, due to memcpy and memmove having the same address.
+    ASAN_INTERCEPT_FUNC(memmove);
   }
+  CHECK(REAL(memcopy));
 
   // Intercept str* functions.
   ASAN_INTERCEPT_FUNC(strcat);  // NOLINT


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