Hello.
As mentioned in: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68758#c5, I
consider
more logic to encapsulate valgrind annotation magic within a
ENABLE_VALGRIND_ANNOTATIONS
macro rather than ENABLE_VALGRIND_CHECKING.
With patch applied, ggc invalid reads/writes, reported by valgrind tool, are
gone.
The patch can survive regression tests and bootstrap on x86_64-linux-gnu?
Ready for trunk?
Thanks,
Martin
>From bfa1e418c8039f8f81047fc1c60c185a95a4deca Mon Sep 17 00:00:00 2001
From: marxin <mli...@suse.cz>
Date: Wed, 6 Jan 2016 13:29:33 +0100
Subject: [PATCH] Fix PR pch/68758.
gcc/ChangeLog:
2016-01-06 Martin Liska <mli...@suse.cz>
PR pch/68758
* ggc-common.c (gt_pch_save): Use ENABLE_VALGRIND_ANNOTATIONS macro
instead of ENABLE_VALGRIND_CHECKING.
---
gcc/ggc-common.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
index c919ba8..9b291aa 100644
--- a/gcc/ggc-common.c
+++ b/gcc/ggc-common.c
@@ -492,7 +492,7 @@ gt_pch_save (FILE *f)
ggc_pch_prepare_write (state.d, state.f);
-#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS
+#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS
vec<char> vbits = vNULL;
#endif
@@ -504,7 +504,7 @@ gt_pch_save (FILE *f)
this_object_size = state.ptrs[i]->size;
this_object = XRESIZEVAR (char, this_object, this_object_size);
}
-#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS
+#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS
/* obj might contain uninitialized bytes, e.g. in the trailing
padding of the object. Avoid warnings by making the memory
temporarily defined and then restoring previous state. */
@@ -561,7 +561,7 @@ gt_pch_save (FILE *f)
state.ptrs[i]->note_ptr_fn == gt_pch_p_S);
if (state.ptrs[i]->note_ptr_fn != gt_pch_p_S)
memcpy (state.ptrs[i]->obj, this_object, state.ptrs[i]->size);
-#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS
+#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS
if (__builtin_expect (get_vbits == 1, 0))
{
(void) VALGRIND_SET_VBITS (state.ptrs[i]->obj, vbits.address (),
@@ -575,7 +575,7 @@ gt_pch_save (FILE *f)
}
#endif
}
-#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS
+#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS
vbits.release ();
#endif
--
2.7.0
