From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 7 Mar 2010 20:07:15 +0000 (+0000)
Subject: Do not suppress data races on user-annotated addresses.
X-Git-Tag: svn/VALGRIND_3_6_0~344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9260267611f7bed96e2b1c78f201f25792a28bec;p=thirdparty%2Fvalgrind.git

Do not suppress data races on user-annotated addresses.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11080
---

diff --git a/drd/drd_clientobj.c b/drd/drd_clientobj.c
index e734aad5f1..41cdb87bb5 100644
--- a/drd/drd_clientobj.c
+++ b/drd/drd_clientobj.c
@@ -144,7 +144,10 @@ DrdClientobj* DRD_(clientobj_add)(const Addr a1, const ObjType t)
    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 @@ void DRD_(clientobj_stop_using_mem)(const Addr a1, const Addr a2)
 
    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);