From b3a73708fe1bb291a99abcb13a8ebeb0aca2bea4 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Fri, 9 Jan 2015 23:27:12 +0000 Subject: Revert "Reapply debug info changes now that more precise column information is available." While the clang patch is reverted pending investigation/fixes. This reverts commit r225001. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@225560 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tsan/simple_stack.c | 2 +- test/tsan/simple_stack2.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/tsan/simple_stack.c b/test/tsan/simple_stack.c index 62840c27d..87367033b 100644 --- a/test/tsan/simple_stack.c +++ b/test/tsan/simple_stack.c @@ -53,7 +53,7 @@ int main() { // CHECK-NEXT: #1 bar1{{.*}} {{.*}}simple_stack.c:14{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 Thread1{{.*}} {{.*}}simple_stack.c:28{{(:3)?}} ({{.*}}) // CHECK: Previous read of size 4 at {{.*}} by thread T2: -// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack.c:18{{(:20)?}} ({{.*}}) +// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack.c:18{{(:3)?}} ({{.*}}) // CHECK-NEXT: #1 bar2{{.*}} {{.*}}simple_stack.c:23{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 Thread2{{.*}} {{.*}}simple_stack.c:33{{(:3)?}} ({{.*}}) // CHECK: Thread T1 (tid={{.*}}, running) created by main thread at: diff --git a/test/tsan/simple_stack2.cc b/test/tsan/simple_stack2.cc index 7044b82a1..b07d863e4 100644 --- a/test/tsan/simple_stack2.cc +++ b/test/tsan/simple_stack2.cc @@ -48,6 +48,6 @@ int main() { // CHECK-NEXT: #1 bar1{{.*}} {{.*}}simple_stack2.cc:16{{(:3)?}} (simple_stack2.cc.exe+{{.*}}) // CHECK-NEXT: #2 Thread1{{.*}} {{.*}}simple_stack2.cc:34{{(:3)?}} (simple_stack2.cc.exe+{{.*}}) // CHECK: Previous read of size 4 at {{.*}} by main thread: -// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack2.cc:20{{(:22)?}} (simple_stack2.cc.exe+{{.*}}) +// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack2.cc:20{{(:3)?}} (simple_stack2.cc.exe+{{.*}}) // CHECK-NEXT: #1 bar2{{.*}} {{.*}}simple_stack2.cc:29{{(:3)?}} (simple_stack2.cc.exe+{{.*}}) // CHECK-NEXT: #2 main{{.*}} {{.*}}simple_stack2.cc:41{{(:3)?}} (simple_stack2.cc.exe+{{.*}}) -- cgit v1.2.1