Index: compiler-rt/lib/msan/msan_interceptors.cc
===================================================================
--- compiler-rt/lib/msan/msan_interceptors.cc
+++ compiler-rt/lib/msan/msan_interceptors.cc
@@ -1006,8 +1006,22 @@
   CHECK_UNPOISONED(&act->sa_mask, sizeof(act->sa_mask));
 }
 
-INTERCEPTOR(int, sigaction, int signo, const __sanitizer_sigaction *act,
+static int sigaction_impl(int signum, const __sanitizer_sigaction *act,
+                          __sanitizer_sigaction *oldact);
+static void *signal_impl(int signum, void *handler);
+
+INTERCEPTOR(int, sigaction, int signum, const __sanitizer_sigaction *act,
             __sanitizer_sigaction *oldact) {
+  return sigaction_impl(signum, act, oldact);
+}
+
+INTERCEPTOR(int, signal, int signum, void *handler) {
+  handler = signal_impl(signum, handler);
+  return REAL(signal)(signum, handler);
+}
+
+static int sigaction_impl(int signo, const __sanitizer_sigaction *act,
+                          __sanitizer_sigaction *oldact) {
   ENSURE_MSAN_INITED();
   if (act) read_sigaction(act);
   int res;
@@ -1045,19 +1059,18 @@
   return res;
 }
 
-INTERCEPTOR(int, signal, int signo, uptr cb) {
+static void *signal_impl(int signo, void *handler) {
   ENSURE_MSAN_INITED();
   if (flags()->wrap_signals) {
     CHECK_LT(signo, kMaxSignals);
     SpinMutexLock lock(&sigactions_mu);
+    uptr cb = (uptr)handler;
     if (cb != __sanitizer::sig_ign && cb != __sanitizer::sig_dfl) {
       atomic_store(&sigactions[signo], cb, memory_order_relaxed);
-      cb = (uptr) SignalHandler;
+      return (void *)&SignalHandler;
     }
-    return REAL(signal)(signo, cb);
-  } else {
-    return REAL(signal)(signo, cb);
   }
+  return handler;
 }
 
 extern "C" int pthread_attr_init(void *attr);