commit 01b9664740307b39c2907bd84cbb0b2c35be9df4
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sun Dec 30 17:59:19 2018 -0800
committer Gregory P. Smith <greg@krypto.org> Sun Dec 30 17:59:19 2018 -0800
tree 983c88561c514057388cfdd3298a8e35ceff3447
parent c74061d49b2b8275b376e212cccf2922d022e607

bpo-35214: MSan workarounds for socket, time, and test_faulthandler. (GH-11375) (GH-11378)

Add Clang Memory Sanitizer build instrumentation to work around
false positives from the socket and time modules as well as skipping
a couple test_faulthandler tests.
(cherry picked from commit b474e6774d60fa67d5373e361a0ed53c18b24f53)

Co-authored-by: Gregory P. Smith <greg@krypto.org>

Modules/timemodule.c

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 13a174a..5e99bd8 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -34,6 +34,10 @@
 #endif /* MS_WINDOWS */
 #endif /* !__WATCOMC__ || __QNX__ */
 
+#ifdef _Py_MEMORY_SANITIZER
+# include <sanitizer/msan_interface.h>
+#endif
+
 #define SEC_TO_NS (1000 * 1000 * 1000)
 
 /* Forward declarations */
@@ -331,6 +335,9 @@
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
+#ifdef _Py_MEMORY_SANITIZER
+    __msan_unpoison(&clk_id, sizeof(clk_id));
+#endif
     return PyLong_FromLong(clk_id);
 }