zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-03 18:13:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 358697 - valgrind.h: Some code remains even when defining NVALGRIND.

Browse Source 
Patch from Matthias Schwarzott (zzam@gentoo.org).  The patch removes
a volatile memory read which was only there to stop compilers warning
about |format| being unused.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16290
This commit is contained in:
Julian Seward 2017-03-30 12:14:23 +00:00
parent 76e451c60d
commit d52a222f8b
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/valgrind.h
View File

@ -6769,7 +6769,7 @@ __inline
VALGRIND_PRINTF(const char *format, ...)
{
#if defined(NVALGRIND)
if (format) *(volatile const char *)format; /* avoid compiler warning */
(void)format;
return 0;
#else /* NVALGRIND */
#if defined(_MSC_VER) || defined(__MINGW64__)
@ -6808,7 +6808,7 @@ __inline
VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
{
#if defined(NVALGRIND)
if (format) *(volatile const char *)format; /* avoid compiler warning */
(void)format;
return 0;
#else /* NVALGRIND */
#if defined(_MSC_VER) || defined(__MINGW64__)

5
none/tests/Makefile.am
View File

@ -203,6 +203,7 @@ EXTRA_DIST = \
tls.vgtest tls.stderr.exp tls.stdout.exp \
unit_debuglog.stderr.exp unit_debuglog.vgtest \
vgprintf.stderr.exp vgprintf.vgtest \
vgprintf_nvalgrind.stderr.exp vgprintf_nvalgrind.vgtest \
process_vm_readv_writev.stderr.exp process_vm_readv_writev.vgtest
check_PROGRAMS = \
@ -248,6 +249,7 @@ check_PROGRAMS = \
unit_debuglog \
valgrind_cpp_test \
vgprintf \
vgprintf_nvalgrind \
coolo_sigaction \
gxx304 \
process_vm_readv_writev
@ -362,6 +364,9 @@ else
tls2_so_LDFLAGS = -shared
endif
vgprintf_nvalgrind_SOURCES = vgprintf.c
vgprintf_nvalgrind_CFLAGS = -DNVALGRIND
valgrind_cpp_test_SOURCES = valgrind_cpp_test.cpp
valgrind_cpp_test_LDADD = -lstdc++

4
none/tests/vgprintf_nvalgrind.stderr.exp Normal file
View File

@ -0,0 +1,4 @@
0
0

1
none/tests/vgprintf_nvalgrind.vgtest Normal file
View File

@ -0,0 +1 @@
prog: vgprintf_nvalgrind