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 | 8a6cac57625f46e9e9a8977a518e8b92499d612f (patch) | |
| tree | d8ac64beadd33825c3e030a69f47aa06ca4a6b32 | |
| parent | 39fdce1e178196afbbe34d4530c621e58ebab0d4 (diff) | |
| download | compiler-rt-8a6cac57625f46e9e9a8977a518e8b92499d612f.tar.gz compiler-rt-8a6cac57625f46e9e9a8977a518e8b92499d612f.tar.bz2 compiler-rt-8a6cac57625f46e9e9a8977a518e8b92499d612f.tar.xz | |
[asan] relax Linux/zero-base-shadow.cc to make it pass on newer Ubuntu; fix lint
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@179088 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/asan/lit_tests/Linux/zero-base-shadow.cc | 4 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_symbolizer.cc | 2 | ||||
| -rw-r--r-- | lib/tsan/lit_tests/load_shared_lib.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/asan/lit_tests/Linux/zero-base-shadow.cc b/lib/asan/lit_tests/Linux/zero-base-shadow.cc index eefaf7e2..44779a40 100644 --- a/lib/asan/lit_tests/Linux/zero-base-shadow.cc +++ b/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/lib/sanitizer_common/sanitizer_symbolizer.cc b/lib/sanitizer_common/sanitizer_symbolizer.cc index dcbbb154..2feb54ca 100644 --- a/lib/sanitizer_common/sanitizer_symbolizer.cc +++ b/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/lib/tsan/lit_tests/load_shared_lib.cc b/lib/tsan/lit_tests/load_shared_lib.cc index 598b4ca3..dd6fa096 100644 --- a/lib/tsan/lit_tests/load_shared_lib.cc +++ b/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 |