From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 2 Feb 2012 10:58:01 +0000 (+0000)
Subject: Rework r12363
X-Git-Tag: svn/VALGRIND_3_8_0~488
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=068f94865275bc65d8575fb28afca81e63f9d256;p=thirdparty%2Fvalgrind.git

Rework r12363

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

diff --git a/drd/drd_main.c b/drd/drd_main.c
index 3ac34df700..7c7ef9fc36 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -639,16 +639,15 @@ static void drd_thread_finished(ThreadId vg_tid)
 {
    DrdThreadId drd_tid;
 
-#if 0
    /*
-    * The assert statement below doesn't hold if this function is invoked
-    * because thread creation failed. See e.g.
+    * Ignore if invoked because thread creation failed. See e.g.
     * coregrind/m_syswrap/syswrap-amd64-linux.c
     */
-   tl_assert(VG_(get_running_tid)() == vg_tid);
-#endif
+   if (VG_(get_running_tid)() != vg_tid)
+      return;
 
    drd_tid = DRD_(VgThreadIdToDrdThreadId)(vg_tid);
+   tl_assert(drd_tid != DRD_INVALID_THREADID);
    if (DRD_(thread_get_trace_fork_join)())
    {
       DRD_(trace_msg)("drd_thread_finished tid = %d%s", drd_tid,