Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions compiler-rt/lib/dfsan/dfsan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,8 @@ static bool CheckMemoryRangeAvailability(uptr beg, uptr size, bool verbose) {
uptr end = beg + size - 1;
if (!MemoryRangeIsAvailable(beg, end)) {
if (verbose)
Printf("FATAL: Memory range %p - %p is not available.\n", beg, end);
Printf("FATAL: Memory range %p - %p is not available.\n", (void*)beg,
(void*)end);
return false;
}
}
Expand All @@ -1150,8 +1151,8 @@ static bool ProtectMemoryRange(uptr beg, uptr size, const char *name) {
}
if ((uptr)addr != beg) {
uptr end = beg + size - 1;
Printf("FATAL: Cannot protect memory range %p - %p (%s).\n", beg, end,
name);
Printf("FATAL: Cannot protect memory range %p - %p (%s).\n", (void*)beg,
(void*)end, name);
return false;
}
}
Expand All @@ -1172,7 +1173,7 @@ static bool InitShadow(bool init_origins, bool dry_run) {
if (!MEM_IS_APP(&__dfsan::dfsan_init)) {
if (!dry_run)
Printf("FATAL: Code %p is out of application range. Non-PIE build?\n",
(uptr)&__dfsan::dfsan_init);
(void*)&__dfsan::dfsan_init);
return false;
}

Expand Down
3 changes: 2 additions & 1 deletion compiler-rt/lib/fuzzer/FuzzerCorpus.h
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ class InputCorpus {
void PrintFeatureSet() {
for (size_t i = 0; i < kFeatureSetSize; i++) {
if(size_t Sz = GetFeature(i))
Printf("[%zd: id %zd sz%zd] ", i, SmallestElementPerFeature[i], Sz);
Printf("[%zd: id %zd sz%zd] ", i, (size_t)SmallestElementPerFeature[i],
Sz);
}
Printf("\n\t");
for (size_t i = 0; i < Inputs.size(); i++)
Expand Down
4 changes: 2 additions & 2 deletions compiler-rt/lib/fuzzer/FuzzerDriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@ static bool ParseOneFlag(const char *Param) {
auto Val = MyStol(Str);
*FlagDescriptions[F].IntFlag = static_cast<int>(Val);
if (Flags.verbosity >= 2)
Printf("Flag: %s %d\n", Name, Val);
Printf("Flag: %s %d\n", Name, (int)Val);
return true;
} else if (FlagDescriptions[F].UIntFlag) {
auto Val = std::stoul(Str);
*FlagDescriptions[F].UIntFlag = static_cast<unsigned int>(Val);
if (Flags.verbosity >= 2)
Printf("Flag: %s %u\n", Name, Val);
Printf("Flag: %s %u\n", Name, (uint32_t)Val);
return true;
} else if (FlagDescriptions[F].StrFlag) {
*FlagDescriptions[F].StrFlag = Str;
Expand Down
6 changes: 3 additions & 3 deletions compiler-rt/lib/fuzzer/FuzzerLoop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ void FreeHook(const volatile void *ptr) {
void Fuzzer::HandleMalloc(size_t Size) {
if (!Options.MallocLimitMb || (Size >> 20) < (size_t)Options.MallocLimitMb)
return;
Printf("==%d== ERROR: libFuzzer: out-of-memory (malloc(%zd))\n", GetPid(),
Size);
Printf("==%d== ERROR: libFuzzer: out-of-memory (malloc(%zd))\n",
(int)GetPid(), Size);
Printf(" To change the out-of-memory limit use -rss_limit_mb=<N>\n\n");
PrintStackTrace();
DumpCurrentUnit("oom-");
Expand Down Expand Up @@ -568,7 +568,7 @@ size_t Fuzzer::GetCurrentUnitInFuzzingThead(const uint8_t **Data) const {

void Fuzzer::CrashOnOverwrittenData() {
Printf("==%d== ERROR: libFuzzer: fuzz target overwrites its const input\n",
GetPid());
(int)GetPid());
PrintStackTrace();
Printf("SUMMARY: libFuzzer: overwrites-const-input\n");
DumpCurrentUnit("crash-");
Expand Down
18 changes: 9 additions & 9 deletions compiler-rt/lib/hwasan/hwasan_report.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -738,9 +738,9 @@ void BaseReport::PrintHeapOrGlobalCandidate() const {
Printf("%s", d.Default());
Printf("%s", d.Location());
Printf("%p is located %zd bytes %s a %zd-byte region [%p,%p)\n",
untagged_addr, offset, whence,
(void*)untagged_addr, offset, whence,
candidate.heap.end - candidate.heap.begin,
(void *)candidate.heap.begin, (void *)candidate.heap.end);
(void*)candidate.heap.begin, (void*)candidate.heap.end);
Printf("%s", d.Allocation());
Printf("allocated by thread T%u here:\n", candidate.heap.thread_id);
Printf("%s", d.Default());
Expand Down Expand Up @@ -775,14 +775,14 @@ void BaseReport::PrintHeapOrGlobalCandidate() const {
Printf(
"%p is located %s a global variable in "
"\n #0 0x%x (%s+0x%x)\n",
(void *)untagged_addr, candidate.after ? "after" : "before",
(void *)candidate.untagged_addr, module_name, (u32)module_address);
(void*)untagged_addr, candidate.after ? "after" : "before",
(u32)candidate.untagged_addr, module_name, (u32)module_address);
else
Printf(
"%p is located %s a %zd-byte global variable in "
"\n #0 0x%x (%s+0x%x)\n",
(void *)untagged_addr, candidate.after ? "after" : "before", size,
(void *)candidate.untagged_addr, module_name, (u32)module_address);
(void*)untagged_addr, candidate.after ? "after" : "before", size,
(u32)candidate.untagged_addr, module_name, (u32)module_address);
}
Printf("%s", d.Default());
}
Expand Down Expand Up @@ -843,9 +843,9 @@ void BaseReport::PrintAddressDescription() const {
Printf("\nCause: use-after-free\n");
Printf("%s", d.Location());
Printf("%p is located %zd bytes inside a %zd-byte region [%p,%p)\n",
(void *)untagged_addr, untagged_addr - UntagAddr(har.tagged_addr),
(ssize)har.requested_size, UntagAddr(har.tagged_addr),
(void *)(UntagAddr(har.tagged_addr) + har.requested_size));
(void*)untagged_addr, untagged_addr - UntagAddr(har.tagged_addr),
(ssize)har.requested_size, (void*)UntagAddr(har.tagged_addr),
(void*)(UntagAddr(har.tagged_addr) + har.requested_size));
Printf("%s", d.Allocation());
Printf("freed by thread T%u here:\n", ha.free_thread_id);
Printf("%s", d.Default());
Expand Down