tsan: fix suppress_java logic

llvm-svn: 174635
This commit is contained in:
Dmitry Vyukov 2013-02-07 17:12:28 +00:00
parent 462516b737
commit e679798315
1 changed files with 10 additions and 7 deletions

View File

@ -521,14 +521,17 @@ static bool IsJavaNonsense(const ReportDesc *rep) {
&& frame->module == 0)) {
return true;
}
frame = SkipTsanInternalFrames(frame);
if (frame->next == 0
|| (frame->func == 0 && frame->file == 0 && frame->line == 0
if (FrameIsInternal(frame)) {
frame = frame->next;
if (frame == 0
|| (frame->func == 0 && frame->file == 0 && frame->line == 0
&& frame->module == 0)) {
CHECK(frame);
FiredSuppression supp = {rep->typ, frame->pc};
CTX()->fired_suppressions.PushBack(supp);
return true;
if (frame) {
FiredSuppression supp = {rep->typ, frame->pc};
CTX()->fired_suppressions.PushBack(supp);
}
return true;
}
}
}
#endif