[win/asan] Avoid warnings in interception_win.cpp. #118143
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long long') [-Wformat] (observed at x86_64, in AllocateTrampolineRegion) warning: format specifies type 'char *' but the argument has type 'RVAPtr<char>' [-Wformat] (observed at x86_64, in InternalGetProcAddress)
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: None (bernhardu) Changeswarning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long long') [-Wformat] (observed at x86_64, in AllocateTrampolineRegion) warning: format specifies type 'char *' but the argument has type 'RVAPtr<char>' [-Wformat] (observed at x86_64, in InternalGetProcAddress) Full diff: https://github.com/llvm/llvm-project/pull/118143.diff 1 Files Affected:
diff --git a/compiler-rt/lib/interception/interception_win.cpp b/compiler-rt/lib/interception/interception_win.cpp
index dc3018a675dee2..93886e79fd88c8 100644
--- a/compiler-rt/lib/interception/interception_win.cpp
+++ b/compiler-rt/lib/interception/interception_win.cpp
@@ -418,7 +418,7 @@ static void *AllocateTrampolineRegion(uptr min_addr, uptr max_addr,
ReportError(
"interception_win: AllocateTrampolineRegion failed to find free memory; "
"min_addr: %p, max_addr: %p, func_addr: %p, granularity: %zu\n",
- (void *)min_addr, (void *)max_addr, granularity);
+ (void *)min_addr, (void *)max_addr, (void *)func_addr, granularity);
return nullptr;
#else
return ::VirtualAlloc(nullptr,
@@ -1247,7 +1247,7 @@ uptr InternalGetProcAddress(void *module, const char *func_name) {
char function_name[256];
size_t funtion_name_length = _strlen(func);
if (funtion_name_length >= sizeof(function_name) - 1) {
- ReportError("interception_win: func too long: '%s'\n", func);
+ ReportError("interception_win: func too long: '%s'\n", (char *)func);
InterceptionFailed();
}
|
|
Hello @zmodem, does this PR also qualify for a review? |
zmodem
approved these changes
Dec 5, 2024
| @@ -418,7 +418,7 @@ static void *AllocateTrampolineRegion(uptr min_addr, uptr max_addr, | |||
| ReportError( | |||
| "interception_win: AllocateTrampolineRegion failed to find free memory; " | |||
| "min_addr: %p, max_addr: %p, func_addr: %p, granularity: %zu\n", | |||
| (void *)min_addr, (void *)max_addr, granularity); | |||
| (void *)min_addr, (void *)max_addr, (void *)func_addr, granularity); | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long long') [-Wformat] (observed at x86_64, in AllocateTrampolineRegion)
warning: format specifies type 'char *' but the argument has type 'RVAPtr' [-Wformat] (observed at x86_64, in InternalGetProcAddress)