Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-35214: Add _Py_ prefix to MEMORY_SANITIZER def. (GH-10503)

Browse source 
Rename our new MEMORY_SANITIZER define to _Py_MEMORY_SANITIZER.
Project based C Preprocessor namespacing at its finest. :P
This commit is contained in:
Gregory P. Smith 2018-11-12 22:01:22 -08:00 • committed by GitHub
parent 0dc1e45dfd
commit 3015fb8ce4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/Python.h
View file

@ -56,8 +56,8 @@
/* A convenient way for code to know if clang's memory sanitizer is enabled. */ /* A convenient way for code to know if clang's memory sanitizer is enabled. */
#if defined(__has_feature) #if defined(__has_feature)
# if __has_feature(memory_sanitizer) # if __has_feature(memory_sanitizer)
# if !defined(MEMORY_SANITIZER) # if !defined(_Py_MEMORY_SANITIZER)
# define MEMORY_SANITIZER # define _Py_MEMORY_SANITIZER
# endif # endif
# endif # endif
#endif #endif

4
Modules/_ctypes/callproc.c
View file

@ -75,7 +75,7 @@
#include <alloca.h> #include <alloca.h>
#endif #endif
#ifdef MEMORY_SANITIZER #ifdef _Py_MEMORY_SANITIZER
#include <sanitizer/msan_interface.h> #include <sanitizer/msan_interface.h>
#endif #endif
@ -1129,7 +1129,7 @@ PyObject *_ctypes_callproc(PPROC pProc,
rtype = _ctypes_get_ffi_type(restype); rtype = _ctypes_get_ffi_type(restype);
resbuf = alloca(max(rtype->size, sizeof(ffi_arg))); resbuf = alloca(max(rtype->size, sizeof(ffi_arg)));
#ifdef MEMORY_SANITIZER #ifdef _Py_MEMORY_SANITIZER
/* ffi_call actually initializes resbuf, but from asm, which /* ffi_call actually initializes resbuf, but from asm, which
* MemorySanitizer can't detect. Avoid false positives from MSan. */ * MemorySanitizer can't detect. Avoid false positives from MSan. */
if (resbuf != NULL) { if (resbuf != NULL) {

4
Modules/_posixsubprocess.c
View file

@ -21,7 +21,7 @@
#include <dirent.h> #include <dirent.h>
#endif #endif
#ifdef MEMORY_SANITIZER #ifdef _Py_MEMORY_SANITIZER
# include <sanitizer/msan_interface.h> # include <sanitizer/msan_interface.h>
#endif #endif
@ -291,7 +291,7 @@ _close_open_fds_safe(int start_fd, PyObject* py_fds_to_keep)
sizeof(buffer))) > 0) { sizeof(buffer))) > 0) {
struct linux_dirent64 *entry; struct linux_dirent64 *entry;
int offset; int offset;
#ifdef MEMORY_SANITIZER #ifdef _Py_MEMORY_SANITIZER
__msan_unpoison(buffer, bytes); __msan_unpoison(buffer, bytes);
#endif #endif
for (offset = 0; offset < bytes; offset += entry->d_reclen) { for (offset = 0; offset < bytes; offset += entry->d_reclen) {

2
Objects/fileobject.c
View file

@ -3,7 +3,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#if defined(HAVE_GETC_UNLOCKED) && !defined(MEMORY_SANITIZER) #if defined(HAVE_GETC_UNLOCKED) && !defined(_Py_MEMORY_SANITIZER)
/* clang MemorySanitizer doesn't yet understand getc_unlocked. */ /* clang MemorySanitizer doesn't yet understand getc_unlocked. */
#define GETC(f) getc_unlocked(f) #define GETC(f) getc_unlocked(f)
#define FLOCKFILE(f) flockfile(f) #define FLOCKFILE(f) flockfile(f)

4
Python/bootstrap_hash.c
View file

@ -20,7 +20,7 @@
# endif # endif
#endif #endif
#ifdef MEMORY_SANITIZER #ifdef _Py_MEMORY_SANITIZER
# include <sanitizer/msan_interface.h> # include <sanitizer/msan_interface.h>
#endif #endif
@ -147,7 +147,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int blocking, int raise)
else { else {
n = syscall(SYS_getrandom, dest, n, flags); n = syscall(SYS_getrandom, dest, n, flags);
} }
# ifdef MEMORY_SANITIZER # ifdef _Py_MEMORY_SANITIZER
if (n > 0) { if (n > 0) {
__msan_unpoison(dest, n); __msan_unpoison(dest, n);
} }

2
Python/pymath.c
View file

@ -17,7 +17,7 @@ double _Py_force_double(double x)
/* inline assembly for getting and setting the 387 FPU control word on /* inline assembly for getting and setting the 387 FPU control word on
gcc/x86 */ gcc/x86 */
#ifdef MEMORY_SANITIZER #ifdef _Py_MEMORY_SANITIZER
__attribute__((no_sanitize_memory)) __attribute__((no_sanitize_memory))
#endif #endif
unsigned short _Py_get_387controlword(void) { unsigned short _Py_get_387controlword(void) {