diff options
| author | Etienne Bergeron <etienneb@google.com> | 2016-06-21 14:53:16 +0000 |
|---|---|---|
| committer | Etienne Bergeron <etienneb@google.com> | 2016-06-21 14:53:16 +0000 |
| commit | fd3dcb839a6ee0036d68d6f0f67f5430bc577355 (patch) | |
| tree | 63463b7c0793db9891ba95226589ccdece922887 /lib/asan/asan_poisoning.cc | |
| parent | a6c33c43480dd79bfe991ad1b632fdedf6285a7b (diff) | |
[asan] Fix shifting compiler warnings when compiler in 64-bits
Summary:
The MSVC compiler complains about implicit conversion of 32-bits constant to
64-bit when using this shiting pattern 1 << (<64-bit expr>).
Reviewers: rnk
Subscribers: kcc, llvm-commits, wang0109, kubabrecka, chrisha
Differential Revision: http://reviews.llvm.org/D21524
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@273267 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_poisoning.cc')
| -rw-r--r-- | lib/asan/asan_poisoning.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asan/asan_poisoning.cc b/lib/asan/asan_poisoning.cc index f77ab8780..50877ae59 100644 --- a/lib/asan/asan_poisoning.cc +++ b/lib/asan/asan_poisoning.cc @@ -343,7 +343,7 @@ void __sanitizer_annotate_contiguous_container(const void *beg_p, &stack); } CHECK_LE(end - beg, - FIRST_32_SECOND_64(1UL << 30, 1UL << 34)); // Sanity check. + FIRST_32_SECOND_64(1UL << 30, 1ULL << 34)); // Sanity check. uptr a = RoundDownTo(Min(old_mid, new_mid), granularity); uptr c = RoundUpTo(Max(old_mid, new_mid), granularity); |