diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2013-02-08 12:02:00 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2013-02-08 12:02:00 +0000 |
| commit | 167f9e4395e029b98e97e10c2643c94404d37c84 (patch) | |
| tree | 29dfdfed8fdecfdd7db85413aeff109d78d05802 /compiler-rt/lib/asan/asan_allocator2.cc | |
| parent | 659bca56a707f036651a51d7d6943eb1c719200c (diff) | |
| download | bcm5719-llvm-167f9e4395e029b98e97e10c2643c94404d37c84.tar.gz bcm5719-llvm-167f9e4395e029b98e97e10c2643c94404d37c84.zip | |
[ASan] Switch Windows to allocator v2, also fixing some build errors
llvm-svn: 174707
Diffstat (limited to 'compiler-rt/lib/asan/asan_allocator2.cc')
| -rw-r--r-- | compiler-rt/lib/asan/asan_allocator2.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_allocator2.cc b/compiler-rt/lib/asan/asan_allocator2.cc index 5854d0ffd4a..039d1b0c985 100644 --- a/compiler-rt/lib/asan/asan_allocator2.cc +++ b/compiler-rt/lib/asan/asan_allocator2.cc @@ -115,7 +115,7 @@ static u32 RZSize2Log(u32 rz_size) { CHECK_GE(rz_size, 16); CHECK_LE(rz_size, 2048); CHECK(IsPowerOfTwo(rz_size)); - u32 res = __builtin_ctz(rz_size) - 4; + u32 res = Log2(rz_size) - 4; CHECK_EQ(rz_size, RZLog2Size(res)); return res; } |
