[llvm-branch-commits] [compiler-rt-branch] r261138 - Merging r261073:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Feb 17 13:05:23 2016
New Revision: 261138

URL: http://llvm.org/viewvc/llvm-project?rev=261138&view=rev
Log:
Merging r261073:
------------------------------------------------------------------------
r261073 | hahnfeld | 2016-02-16 23:12:18 -0800 (Tue, 16 Feb 2016) | 6 lines

[compiler-rt][msan] Ensure initialisation before calling __msan_unpoison

__msan_unpoison uses intercepted memset which currently leads to a SEGV
when linking with libc++ under CentOS 7.

Differential Revision: http://reviews.llvm.org/D17263
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 17 13:05:23 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260839
+/compiler-rt/trunk:258916,259755,260839,261073

Modified: compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc?rev=261138&r1=261137&r2=261138&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc (original)
+++ compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc Wed Feb 17 13:05:23 2016
@@ -1408,12 +1408,12 @@ int OnExit() {
   __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)