commit b878a738d8ee8e52b9e022a3ac68e9c67c02c1f0
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 07 20:07:15 2010 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 07 20:07:15 2010 +0000
tree 523848a3b3622194e033bbb0578acde40269bbe4
parent 4565e271f5aef35334b6fb4e89bd2ca51840f139

Do not suppress data races on user-annotated addresses.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11080 a5019735-40e9-0310-863c-91ae7b9d1cf9

drd/drd_clientobj.c

diff --git a/drd/drd_clientobj.c b/drd/drd_clientobj.c
index e734aad..41cdb87 100644
--- a/drd/drd_clientobj.c
+++ b/drd/drd_clientobj.c
@@ -144,7 +144,10 @@
    p->any.first_observed_at = VG_(record_ExeContext)(VG_(get_running_tid)(), 0);
    VG_(OSetGen_Insert)(s_clientobj_set, p);
    tl_assert(VG_(OSetGen_Lookup)(s_clientobj_set, &a1) == p);
-   DRD_(start_suppression)(a1, a1 + 1, "clientobj");
+   if (t == ClientHbvar)
+      DRD_(mark_hbvar)(a1);
+   else
+      DRD_(start_suppression)(a1, a1 + 1, "clientobj");
    return p;
 }
 
@@ -208,7 +211,7 @@
 
    tl_assert(s_clientobj_set);
 
-   if (! DRD_(is_any_suppressed)(a1, a2))
+   if (! DRD_(range_contains_suppression_or_hbvar)(a1, a2))
       return;
 
    VG_(OSetGen_ResetIterAt)(s_clientobj_set, &a1);