update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / helgrind / hg_errors.c

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/hg_errors.c b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/hg_errors.c
index 497fe58f0124173f9dc10c32b529758c4f3ffc25..6076f475d7ed3c17d9705ba0293732b2aa009a69 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/hg_errors.c
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/helgrind/hg_errors.c
@@ -123,7 +123,8 @@ static Lock* mk_LockP_from_LockN ( Lock* lkn )
    if (!VG_(lookupFM)( map_LockN_to_P, NULL, (Word*)&lkp, (Word)lkn)) {
       lkp = HG_(zalloc)( "hg.mLPfLN.2", sizeof(Lock) );
       *lkp = *lkn;
-      lkp->admin = NULL;
+      lkp->admin_next = NULL;
+      lkp->admin_prev = NULL;
       lkp->magic = LockP_MAGIC;
       /* Forget about the bag of lock holders - don't copy that.
          Also, acquired_at should be NULL whenever heldBy is, and vice
@@ -340,7 +341,7 @@ UInt HG_(update_extra) ( Error* err )
             Thread* threadp;
             tl_assert(wherep);
             tl_assert(thrp);
-            threadp = libhb_get_Thr_opaque( thrp );
+            threadp = libhb_get_Thr_hgthread( thrp );
             tl_assert(threadp);
             xe->XE.Race.h2_ct_accEC  = wherep;
             xe->XE.Race.h2_ct        = threadp;
@@ -473,8 +474,7 @@ void HG_(record_error_LockOrder)(
 {
    XError xe;
    tl_assert( HG_(is_sane_Thread)(thr) );
-   if (!HG_(clo_track_lockorders))
-      return;
+   tl_assert(HG_(clo_track_lockorders));
    init_XError(&xe);
    xe.tag = XE_LockOrder;
    xe.XE.LockOrder.thr       = thr;