From e2c096f25f0d8c83f4fb80e3022d4c577ccb4b2f Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Mon, 17 Mar 2014 15:16:25 +0000 Subject: [sanitizer] fix the deadlock detector build git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@204044 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/sanitizer_common/sanitizer_deadlock_detector2.cc | 2 +- lib/tsan/dd/dd_rtl.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sanitizer_common/sanitizer_deadlock_detector2.cc b/lib/sanitizer_common/sanitizer_deadlock_detector2.cc index 26c8b0bdc..fe7183b07 100644 --- a/lib/sanitizer_common/sanitizer_deadlock_detector2.cc +++ b/lib/sanitizer_common/sanitizer_deadlock_detector2.cc @@ -355,7 +355,7 @@ void DD::Report(DDPhysicalThread *pt, DDLogicalThread *lt, int npath) { rep->loop[i].thr_ctx = link->tid; rep->loop[i].mtx_ctx0 = link0->id; rep->loop[i].mtx_ctx1 = link->id; - rep->loop[i].stk = link->stk; + rep->loop[i].stk[1] = link->stk; } pt->report_pending = true; } diff --git a/lib/tsan/dd/dd_rtl.cc b/lib/tsan/dd/dd_rtl.cc index 329d59d46..aed9debef 100644 --- a/lib/tsan/dd/dd_rtl.cc +++ b/lib/tsan/dd/dd_rtl.cc @@ -44,7 +44,7 @@ static void ReportDeadlock(Thread *thr, DDReport *rep) { for (int i = 0; i < rep->n; i++) { Printf("Thread %d locks mutex %llu while holding mutex %llu:\n", rep->loop[i].thr_ctx, rep->loop[i].mtx_ctx1, rep->loop[i].mtx_ctx0); - PrintStackTrace(thr, rep->loop[i].stk); + PrintStackTrace(thr, rep->loop[i].stk[1]); } Printf("==============================\n"); } -- cgit v1.2.3