diff options
| author | Kostya Serebryany <kcc@google.com> | 2012-08-21 06:43:44 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2012-08-21 06:43:44 +0000 |
| commit | 0ffc227f91b068c78908f735a4846f92e339a337 (patch) | |
| tree | 26fd43f686ef5fab45d10324833d949e9b45db64 /lib/asan/asan_mac.cc | |
| parent | 2483ce3e635515d907c0cd8c97db315142fb28db (diff) | |
| download | compiler-rt-0ffc227f91b068c78908f735a4846f92e339a337.tar.gz compiler-rt-0ffc227f91b068c78908f735a4846f92e339a337.tar.bz2 compiler-rt-0ffc227f91b068c78908f735a4846f92e339a337.tar.xz | |
[asan] fix lint
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162258 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_mac.cc')
| -rw-r--r-- | lib/asan/asan_mac.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/asan/asan_mac.cc b/lib/asan/asan_mac.cc index 0118da8e..828dc4a9 100644 --- a/lib/asan/asan_mac.cc +++ b/lib/asan/asan_mac.cc @@ -295,7 +295,7 @@ asan_block_context_t *alloc_asan_context(void *ctxt, dispatch_function_t func, } \ return REAL(dispatch_x_f)(dq, (void*)asan_ctxt, \ asan_dispatch_call_block_and_release); \ - } + } INTERCEPT_DISPATCH_X_F_3(dispatch_async_f) INTERCEPT_DISPATCH_X_F_3(dispatch_sync_f) @@ -336,13 +336,13 @@ static void _dispatch_call_block_and_release(void *block) { // See // http://www.opensource.apple.com/source/libdispatch/libdispatch-228.18/src/internal.h -#define fastpath(x) ((typeof(x))__builtin_expect((long)(x), ~0l)) +#define fastpath(x) ((typeof(x))__builtin_expect((uptr)(x), ~0l)) // See // http://www.opensource.apple.com/source/libdispatch/libdispatch-228.18/src/init.c static dispatch_block_t _dispatch_Block_copy(dispatch_block_t db) { dispatch_block_t rval; - if (fastpath(db)) { + if (fastpath(db)) { while (!fastpath(rval = Block_copy(db))) { sleep(1); } |