Follow-up for r367863 and r367656

llvm-svn: 367888
This commit is contained in:
Nico Weber 2019-08-05 16:50:56 +00:00
parent 673dc3d4a0
commit bb7ad98a47
4 changed files with 4 additions and 4 deletions

View File

@ -1157,7 +1157,7 @@ static int cond_wait(ThreadState *thr, uptr pc, ScopedInterceptor *si,
CondMutexUnlockCtx arg = {si, thr, pc, m};
int res = 0;
// This ensures that we handle mutex lock even in case of pthread_cancel.
// See test/tsan/cond_cancel.cc.
// See test/tsan/cond_cancel.cpp.
{
// Enable signal delivery while the thread is blocked.
BlockingCall bc(thr);

View File

@ -650,7 +650,7 @@ void ReportRace(ThreadState *thr) {
// and the resulting PC has kExternalPCBit set, so we pass it to
// __tsan_symbolize_external_ex. __tsan_symbolize_external_ex is within its
// rights to crash since the PC is completely bogus.
// test/tsan/double_race.cc contains a test case for this.
// test/tsan/double_race.cpp contains a test case for this.
toppc = 0;
}
ObtainCurrentStack(thr, toppc, &traces[0], &tags[0]);

View File

@ -22,6 +22,6 @@ int main(int argc, char **argv) {
// CHECK0-NOT: Sanitizer:DEADLYSIGNAL
// CHECK1: ERROR: {{.*}}Sanitizer: ILL
// CHECK1: {{#[0-9]+.* main .*ill\.cc:[0-9]+}}
// CHECK1: {{#[0-9]+.* main .*ill\.cpp:[0-9]+}}
// CHECK1: DEATH CALLBACK
// CHECK0-NOT: Sanitizer

View File

@ -24,6 +24,6 @@ int main(int argc, char **argv) {
// CHECK0-NOT: Sanitizer:DEADLYSIGNAL
// CHECK1: ERROR: {{.*}}Sanitizer: FPE
// CHECK1: {{#[0-9]+.* main .*fpe\.cc}}:[[@LINE-5]]
// CHECK1: {{#[0-9]+.* main .*fpe\.cpp}}:[[@LINE-5]]
// CHECK1: DEATH CALLBACK
// CHECK0-NOT: Sanitizer