[PATCH] D17263: [compiler-rt][msan] Ensure initialisation before calling __msan_unpoison

[Jonas Hahnfeld via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL261073: [compiler-rt][msan] Ensure initialisation before calling __msan_unpoison (authored by Hahnfeld).

Changed prior to commit:
  http://reviews.llvm.org/D17263?vs=47974&id=48155#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D17263

Files:
  compiler-rt/trunk/lib/msan/msan_interceptors.cc

Index: compiler-rt/trunk/lib/msan/msan_interceptors.cc
===================================================================
--- compiler-rt/trunk/lib/msan/msan_interceptors.cc
+++ compiler-rt/trunk/lib/msan/msan_interceptors.cc
@@ -1433,12 +1433,12 @@
   __msan_unpoison(ptr, size)
 #define COMMON_INTERCEPTOR_ENTER(ctx, func, ...)                  \
   if (msan_init_is_running) return REAL(func)(__VA_ARGS__);       \
+  ENSURE_MSAN_INITED();                                           \
   MSanInterceptorContext msan_ctx = {IsInInterceptorScope()};     \
   ctx = (void *)&msan_ctx;                                        \
   (void)ctx;                                                      \
   InterceptorScope interceptor_scope;                             \
-  __msan_unpoison(__errno_location(), sizeof(int)); /* NOLINT */  \
-  ENSURE_MSAN_INITED();
+  __msan_unpoison(__errno_location(), sizeof(int)); /* NOLINT */
 #define COMMON_INTERCEPTOR_DIR_ACQUIRE(ctx, path) \
   do {                                            \
   } while (false)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D17263.48155.patch
Type: text/x-patch
Size: 1049 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160217/c2bd6f3c/attachment.bin>