diff options
-rw-r--r-- | lib/asan/asan_fake_stack.cc | 2 | ||||
-rw-r--r-- | lib/asan/asan_fake_stack.h | 2 | ||||
-rw-r--r-- | lib/asan/asan_interceptors.cc | 2 | ||||
-rw-r--r-- | lib/asan/asan_poisoning.h | 2 | ||||
-rw-r--r-- | lib/asan/asan_report.cc | 16 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_allocator.h | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_common_libcdep.cc | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_flags.cc | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_printf.cc | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/lib/asan/asan_fake_stack.cc b/lib/asan/asan_fake_stack.cc index 23eebe64e..2fe8ef4fe 100644 --- a/lib/asan/asan_fake_stack.cc +++ b/lib/asan/asan_fake_stack.cc @@ -141,7 +141,7 @@ ALWAYS_INLINE uptr FakeStack::AllocateStack(uptr size, uptr real_stack) { ALWAYS_INLINE void FakeStack::DeallocateFrame(FakeFrame *fake_frame) { CHECK(alive_); - uptr size = fake_frame->size_minus_one + 1; + uptr size = static_cast<uptr>(fake_frame->size_minus_one + 1); uptr size_class = ComputeSizeClass(size); CHECK(allocated_size_classes_[size_class]); uptr ptr = (uptr)fake_frame; diff --git a/lib/asan/asan_fake_stack.h b/lib/asan/asan_fake_stack.h index 308b4c571..a11a3dbe2 100644 --- a/lib/asan/asan_fake_stack.h +++ b/lib/asan/asan_fake_stack.h @@ -80,7 +80,7 @@ class FakeStack { static void OnFree(uptr ptr, uptr size, uptr real_stack); // Return the bottom of the maped region. uptr AddrIsInFakeStack(uptr addr); - bool StackSize() { return stack_size_; } + uptr StackSize() const { return stack_size_; } private: static const uptr kMinStackFrameSizeLog = 9; // Min frame is 512B. diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc index d9dcb1c52..3c8531081 100644 --- a/lib/asan/asan_interceptors.cc +++ b/lib/asan/asan_interceptors.cc @@ -673,7 +673,7 @@ INTERCEPTOR_WINAPI(DWORD, CreateThread, u32 current_tid = GetCurrentTidOrInvalid(); AsanThread *t = AsanThread::Create(start_routine, arg); CreateThreadContextArgs args = { t, &stack }; - int detached = 0; // FIXME: how can we determine it on Windows? + bool detached = 0; // FIXME: how can we determine it on Windows? asanThreadRegistry().CreateThread(*(uptr*)t, detached, current_tid, &args); return REAL(CreateThread)(security, stack_size, asan_thread_start, t, flags, tid); diff --git a/lib/asan/asan_poisoning.h b/lib/asan/asan_poisoning.h index 86f81e5d0..91275465d 100644 --- a/lib/asan/asan_poisoning.h +++ b/lib/asan/asan_poisoning.h @@ -50,7 +50,7 @@ ALWAYS_INLINE void FastPoisonShadowPartialRightRedzone( } else if (i >= size) { *shadow = (SHADOW_GRANULARITY == 128) ? 0xff : value; // unaddressable } else { - *shadow = size - i; // first size-i bytes are addressable + *shadow = static_cast<u8>(size - i); // first size-i bytes are addressable } } } diff --git a/lib/asan/asan_report.cc b/lib/asan/asan_report.cc index aeeebf452..f8cc906d3 100644 --- a/lib/asan/asan_report.cc +++ b/lib/asan/asan_report.cc @@ -125,7 +125,7 @@ static void PrintLegend() { "application bytes):\n", (int)SHADOW_GRANULARITY); PrintShadowByte(" Addressable: ", 0); Printf(" Partially addressable: "); - for (uptr i = 1; i < SHADOW_GRANULARITY; i++) + for (u8 i = 1; i < SHADOW_GRANULARITY; i++) PrintShadowByte("", i, " "); Printf("\n"); PrintShadowByte(" Heap left redzone: ", kAsanHeapLeftRedzoneMagic); @@ -267,7 +267,7 @@ const char *ThreadNameWithParenthesis(u32 tid, char buff[], bool DescribeAddressIfStack(uptr addr, uptr access_size) { AsanThread *t = FindThreadByStackAddress(addr); if (!t) return false; - const sptr kBufSize = 4095; + const s64 kBufSize = 4095; char buf[kBufSize]; uptr offset = 0; uptr frame_pc = 0; @@ -306,13 +306,13 @@ bool DescribeAddressIfStack(uptr addr, uptr access_size) { PrintStack(&alloca_stack); // Report the number of stack objects. char *p; - uptr n_objects = internal_simple_strtoll(frame_descr, &p, 10); + s64 n_objects = internal_simple_strtoll(frame_descr, &p, 10); CHECK_GT(n_objects, 0); Printf(" This frame has %zu object(s):\n", n_objects); // Report all objects in this frame. - for (uptr i = 0; i < n_objects; i++) { - uptr beg, size; - sptr len; + for (s64 i = 0; i < n_objects; i++) { + s64 beg, size; + s64 len; beg = internal_simple_strtoll(p, &p, 10); size = internal_simple_strtoll(p, &p, 10); len = internal_simple_strtoll(p, &p, 10); @@ -323,9 +323,9 @@ bool DescribeAddressIfStack(uptr addr, uptr access_size) { } p++; buf[0] = 0; - internal_strncat(buf, p, Min(kBufSize, len)); + internal_strncat(buf, p, static_cast<uptr>(Min(kBufSize, len))); p += len; - Printf(" [%zu, %zu) '%s'\n", beg, beg + size, buf); + Printf(" [%lld, %lld) '%s'\n", beg, beg + size, buf); } Printf("HINT: this may be a false positive if your program uses " "some custom stack unwind mechanism or swapcontext\n" diff --git a/lib/sanitizer_common/sanitizer_allocator.h b/lib/sanitizer_common/sanitizer_allocator.h index 0542addb7..b20a05be7 100644 --- a/lib/sanitizer_common/sanitizer_allocator.h +++ b/lib/sanitizer_common/sanitizer_allocator.h @@ -779,7 +779,7 @@ class SizeClassAllocator32 { MapUnmapCallback().OnMap(res, kRegionSize); stat->Add(AllocatorStatMmapped, kRegionSize); CHECK_EQ(0U, (res & (kRegionSize - 1))); - possible_regions.set(ComputeRegionId(res), class_id); + possible_regions.set(ComputeRegionId(res), static_cast<u8>(class_id)); return res; } diff --git a/lib/sanitizer_common/sanitizer_common_libcdep.cc b/lib/sanitizer_common/sanitizer_common_libcdep.cc index 36f6cf0bc..c730ccfbd 100644 --- a/lib/sanitizer_common/sanitizer_common_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_common_libcdep.cc @@ -17,7 +17,7 @@ namespace __sanitizer { bool PrintsToTty() { MaybeOpenReportFile(); - return internal_isatty(report_fd); + return internal_isatty(report_fd) != 0; } } // namespace __sanitizer diff --git a/lib/sanitizer_common/sanitizer_flags.cc b/lib/sanitizer_common/sanitizer_flags.cc index b7218e5ad..803d47056 100644 --- a/lib/sanitizer_common/sanitizer_flags.cc +++ b/lib/sanitizer_common/sanitizer_flags.cc @@ -97,7 +97,7 @@ void ParseFlag(const char *env, int *flag, const char *name) { int value_length; if (!GetFlagValue(env, name, &value, &value_length)) return; - *flag = internal_atoll(value); + *flag = static_cast<int>(internal_atoll(value)); } static LowLevelAllocator allocator_for_flags; diff --git a/lib/sanitizer_common/sanitizer_printf.cc b/lib/sanitizer_common/sanitizer_printf.cc index 5935d7f17..74c628923 100644 --- a/lib/sanitizer_common/sanitizer_printf.cc +++ b/lib/sanitizer_common/sanitizer_printf.cc @@ -59,7 +59,7 @@ static int AppendUnsigned(char **buff, const char *buff_end, u64 num, } int result = 0; while (pos-- > 0) { - uptr digit = num_buffer[pos]; + char digit = static_cast<char>(num_buffer[pos]); result += AppendChar(buff, buff_end, (digit < 10) ? '0' + digit : 'a' + digit - 10); } |