tsan: enabled report suppression for signal-unsafe reports
llvm-svn: 156765
diff --git a/compiler-rt/lib/tsan/rtl/tsan_mman.cc b/compiler-rt/lib/tsan/rtl/tsan_mman.cc
index e24074e..124d5ca 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_mman.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_mman.cc
@@ -25,7 +25,7 @@
stack.ObtainCurrent(thr, pc);
ScopedReport rep(ReportTypeSignalUnsafe);
rep.AddStack(&stack);
- OutputReport(rep);
+ OutputReport(rep, rep.GetReport()->stacks[0]);
}
void *user_alloc(ThreadState *thr, uptr pc, uptr sz) {
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.h b/compiler-rt/lib/tsan/rtl/tsan_rtl.h
index a5bdd52..765ad00 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.h
@@ -371,7 +371,8 @@
void Die() NORETURN;
void ReportRace(ThreadState *thr);
-bool OutputReport(const ScopedReport &srep, ReportStack *suppress_stack = 0);
+bool OutputReport(const ScopedReport &srep,
+ const ReportStack *suppress_stack = 0);
bool IsExpectedReport(uptr addr, uptr size);
#if defined(TSAN_DEBUG_OUTPUT) && TSAN_DEBUG_OUTPUT >= 1
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
index a5c5417..534e305 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
@@ -273,7 +273,7 @@
}
}
-bool OutputReport(const ScopedReport &srep, ReportStack *suppress_stack) {
+bool OutputReport(const ScopedReport &srep, const ReportStack *suppress_stack) {
const ReportDesc *rep = srep.GetReport();
bool suppressed = IsSuppressed(rep->typ, suppress_stack);
suppressed = OnReport(rep, suppressed);