diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2013-02-04 08:07:45 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2013-02-04 08:07:45 +0000 |
| commit | 8ceeec4f343768b199e7c891865029360b7225dc (patch) | |
| tree | db7b105bd3f73b16311fe006ed1c6da48938b5ab /lib/sanitizer_common/sanitizer_libc.cc | |
| parent | 52c70e5818727521b89f7fc95a2a383df8985ca6 (diff) | |
| download | compiler-rt-8ceeec4f343768b199e7c891865029360b7225dc.tar.gz | |
asan/tsan: fix compilation errors/bugs on Windows where long is 32-bit even in 64-bit mode
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@174312 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_libc.cc')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_libc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_libc.cc b/lib/sanitizer_common/sanitizer_libc.cc index 349be3501..20c03c447 100644 --- a/lib/sanitizer_common/sanitizer_libc.cc +++ b/lib/sanitizer_common/sanitizer_libc.cc @@ -206,7 +206,7 @@ s64 internal_simple_strtoll(const char *nptr, char **endptr, int base) { } bool mem_is_zero(const char *beg, uptr size) { - CHECK_LE(size, 1UL << FIRST_32_SECOND_64(30, 40)); // Sanity check. + CHECK_LE(size, 1ULL << FIRST_32_SECOND_64(30, 40)); // Sanity check. const char *end = beg + size; uptr *aligned_beg = (uptr *)RoundUpTo((uptr)beg, sizeof(uptr)); uptr *aligned_end = (uptr *)RoundDownTo((uptr)end, sizeof(uptr)); |