replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[tsan] fix the include path that is broken in configure/make build but works in cmake build (PR18144). This is a quick fix. Will need to fix the configure/make build properly 

llvm-svn: 196490
This commit is contained in:
Kostya Serebryany 2013-12-05 09:42:59 +00:00
parent f2c93b2973
commit 9ffa232f06
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc
View File

@ -47,8 +47,8 @@ int main(int argc, char **argv) {
RecuriveFunctionWithStackFrame<1024>(10);
stale_stack[100]++;
// CHECK: ERROR: AddressSanitizer: stack-use-after-return on address
// CHECK: is located in stack of thread T0 at offset 132 in frame
// CHECK: is located in stack of thread T0 at offset {{116|132}} in frame
// CHECK: in LeakStack(){{.*}}heavy_uar_test.cc:
// CHECK: [32, 1056) 'x'
// CHECK: [{{16|32}}, {{1040|1056}}) 'x'
return 0;
}

33
compiler-rt/lib/asan/lit_tests/TestCases/stack-buffer-overflow-with-position.cc
View File

@ -5,15 +5,14 @@
// RUN: %t 8
// RUN: not %t 9 2>&1 | FileCheck --check-prefix=CHECK-9 %s
// RUN: not %t 10 2>&1 | FileCheck --check-prefix=CHECK-10 %s
// RUN: not %t 30 2>&1 | FileCheck --check-prefix=CHECK-30 %s
// RUN: not %t 31 2>&1 | FileCheck --check-prefix=CHECK-31 %s
// RUN: not %t 41 2>&1 | FileCheck --check-prefix=CHECK-41 %s
// RUN: not %t 42 2>&1 | FileCheck --check-prefix=CHECK-42 %s
// RUN: not %t 62 2>&1 | FileCheck --check-prefix=CHECK-62 %s
// RUN: not %t 63 2>&1 | FileCheck --check-prefix=CHECK-63 %s
// RUN: not %t 63 2>&1 | FileCheck --check-prefix=CHECK-63 %s
// RUN: not %t 73 2>&1 | FileCheck --check-prefix=CHECK-73 %s
// RUN: not %t 74 2>&1 | FileCheck --check-prefix=CHECK-74 %s
// RUN: not %t 126 2>&1 | FileCheck --check-prefix=CHECK-126 %s
// RUN: not %t 127 2>&1 | FileCheck --check-prefix=CHECK-127 %s
// RUN: not %t 137 2>&1 | FileCheck --check-prefix=CHECK-137 %s
// RUN: not %t 138 2>&1 | FileCheck --check-prefix=CHECK-138 %s
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@ -31,15 +30,15 @@ int main(int argc, char **argv) {
// make sure BBB and CCC are not removed;
return *(short*)(p) + BBB[argc % 2] + CCC[argc % 2];
}
// CHECK-m2: 'AAA' <== Memory access at offset 30 underflows this variable
// CHECK-m1: 'AAA' <== Memory access at offset 31 partially underflows this variable
// CHECK-9: 'AAA' <== Memory access at offset 41 partially overflows this variable
// CHECK-10: 'AAA' <== Memory access at offset 42 overflows this variable
// CHECK-62: 'BBB' <== Memory access at offset 94 underflows this variable
// CHECK-63: 'BBB' <== Memory access at offset 95 partially underflows this variable
// CHECK-73: 'BBB' <== Memory access at offset 105 partially overflows this variable
// CHECK-74: 'BBB' <== Memory access at offset 106 overflows this variable
// CHECK-126: 'CCC' <== Memory access at offset 158 underflows this variable
// CHECK-127: 'CCC' <== Memory access at offset 159 partially underflows this variable
// CHECK-137: 'CCC' <== Memory access at offset 169 partially overflows this variable
// CHECK-138: 'CCC' <== Memory access at offset 170 overflows this variable
// CHECK-m2: 'AAA' <== {{.*}}underflows this variable
// CHECK-m1: 'AAA' <== {{.*}}partially underflows this variable
// CHECK-9: 'AAA' <== {{.*}}partially overflows this variable
// CHECK-10: 'AAA' <== {{.*}}overflows this variable
// CHECK-30: 'BBB' <== {{.*}}underflows this variable
// CHECK-31: 'BBB' <== {{.*}}partially underflows this variable
// CHECK-41: 'BBB' <== {{.*}}partially overflows this variable
// CHECK-42: 'BBB' <== {{.*}}overflows this variable
// CHECK-62: 'CCC' <== {{.*}}underflows this variable
// CHECK-63: 'CCC' <== {{.*}}partially underflows this variable
// CHECK-73: 'CCC' <== {{.*}}partially overflows this variable
// CHECK-74: 'CCC' <== {{.*}}overflows this variable

4
compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc
View File

@ -51,11 +51,11 @@ void Func2(char *x) {
// CHECK: WRITE of size 1 {{.*}} thread T0
// CHECK: #0{{.*}}Func2{{.*}}stack-use-after-return.cc:[[@LINE-2]]
// CHECK: is located in stack of thread T0 at offset
// CHECK: 'local' <== Memory access at offset 32 is inside this variable
// CHECK: 'local' <== Memory access at offset {{16|32}} is inside this variable
// THREAD: WRITE of size 1 {{.*}} thread T{{[1-9]}}
// THREAD: #0{{.*}}Func2{{.*}}stack-use-after-return.cc:[[@LINE-6]]
// THREAD: is located in stack of thread T{{[1-9]}} at offset
// THREAD: 'local' <== Memory access at offset 32 is inside this variable
// THREAD: 'local' <== Memory access at offset {{16|32}} is inside this variable
// CHECK-20: T0: FakeStack created:{{.*}} stack_size_log: 20
// CHECK-24: T0: FakeStack created:{{.*}} stack_size_log: 24
}

2
compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
View File

@ -1,4 +1,4 @@
#include "sanitizer_common/sanitizer_asm.h"
#include "../../sanitizer_common/sanitizer_asm.h"
.section .text
.hidden __tsan_trace_switch