summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2014-03-17 15:16:25 +0000
committerKostya Serebryany <kcc@google.com>2014-03-17 15:16:25 +0000
commite2c096f25f0d8c83f4fb80e3022d4c577ccb4b2f (patch)
treee8f2247c53ccf931602c52966b25e5b11f2c9eb3
parent73557dda0918b7a3e4184a6431118c64f04aefff (diff)
[sanitizer] fix the deadlock detector build
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@204044 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/sanitizer_common/sanitizer_deadlock_detector2.cc2
-rw-r--r--lib/tsan/dd/dd_rtl.cc2
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");
}