[llvm-commits] [compiler-rt] r173263 - /compiler-rt/trunk/lib/msan/msan_interceptors.cc

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Jan 23 08:22:05 2013
New Revision: 173263

URL: http://llvm.org/viewvc/llvm-project?rev=173263&view=rev
Log:
[msan] Allow waitpid while in __msan_init().

This is used in symbolizer init.

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

Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=173263&r1=173262&r2=173263&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Wed Jan 23 08:22:05 2013
@@ -512,6 +512,8 @@
 }
 
 INTERCEPTOR(int, waitpid, int pid, int *status, int options) {
+  if (msan_init_is_running)
+    return REAL(waitpid)(pid, status, options);
   ENSURE_MSAN_INITED();
   int res = REAL(waitpid)(pid, status, options);
   if (status)