diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-04-09 07:08:05 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2013-04-09 07:08:05 +0000 |
| commit | 9d28efc1ad6caf963a85238f5b0870ea5a7d709f (patch) | |
| tree | a62920b7805d1bbf86b71e50623221e9a5e6c15d /compiler-rt | |
| parent | ccc93e72e1db785bc661fb9d02a3f7e0010f6280 (diff) | |
| download | bcm5719-llvm-9d28efc1ad6caf963a85238f5b0870ea5a7d709f.tar.gz bcm5719-llvm-9d28efc1ad6caf963a85238f5b0870ea5a7d709f.zip | |
[asan] relax Linux/zero-base-shadow.cc to make it pass on newer Ubuntu; fix lint
llvm-svn: 179088
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/asan/lit_tests/Linux/zero-base-shadow.cc | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/compiler-rt/lib/asan/lit_tests/Linux/zero-base-shadow.cc b/compiler-rt/lib/asan/lit_tests/Linux/zero-base-shadow.cc index eefaf7e22fe..44779a40558 100644 --- a/compiler-rt/lib/asan/lit_tests/Linux/zero-base-shadow.cc +++ b/compiler-rt/lib/asan/lit_tests/Linux/zero-base-shadow.cc @@ -22,7 +22,7 @@ int main(int argc, char **argv) { // CHECK: main // Check that shadow for stack memory occupies lower part of address space. - // CHECK-64: =>0x0f{{.*}} - // CHECK-32: =>0x1f{{.*}} + // CHECK-64: =>0x0f + // CHECK-32: =>0x1 return res; } diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.cc b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.cc index dcbbb15411b..2feb54ca096 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.cc @@ -239,7 +239,7 @@ class InternalSymbolizer { class Symbolizer { public: - Symbolizer() : modules_fresh_(false) { }; + Symbolizer() : modules_fresh_(false) { } uptr SymbolizeCode(uptr addr, AddressInfo *frames, uptr max_frames) { if (max_frames == 0) return 0; diff --git a/compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc b/compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc index 598b4ca3109..dd6fa0964f4 100644 --- a/compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc +++ b/compiler-rt/lib/tsan/lit_tests/load_shared_lib.cc @@ -19,7 +19,7 @@ void *write_glob(void *unused) { return NULL; } -void race_two_threads(void *(*access_callback)(void *)) { +void race_two_threads(void *(*access_callback)(void *unused)) { pthread_t t1, t2; pthread_create(&t1, NULL, access_callback, NULL); pthread_create(&t2, NULL, access_callback, NULL); @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { printf("error in dlopen(): %s\n", dlerror()); return 1; } - void *(*write_from_so)(void *); + void *(*write_from_so)(void *unused); *(void **)&write_from_so = dlsym(lib, "write_from_so"); race_two_threads(write_from_so); // CHECK: write_from_so |
