[gold] Don't pass StringRef to message() #95083
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
This is a printf style variadic function. If using a "%s" format, we should pass "const char *" rather than "StringRef". The use of data() here is safe because we know that the StringRef was originally derived from a null-terminated string.
|
@llvm/pr-subscribers-lto Author: Nikita Popov (nikic) ChangesThis is a printf style variadic function. If using a "%s" format, we should pass "const char *" rather than "StringRef". The use of data() here is safe because we know that the StringRef was originally derived from a null-terminated string. Full diff: https://github.com/llvm/llvm-project/pull/95083.diff 1 Files Affected:
diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
index 265ebcbff5877..0b175a3852e42 100644
--- a/llvm/tools/gold/gold-plugin.cpp
+++ b/llvm/tools/gold/gold-plugin.cpp
@@ -307,7 +307,8 @@ namespace options {
} else if (opt.consume_front("opt-remarks-hotness-threshold=")) {
auto ResultOrErr = remarks::parseHotnessThresholdOption(opt);
if (!ResultOrErr)
- message(LDPL_FATAL, "Invalid remarks hotness threshold: %s", opt);
+ message(LDPL_FATAL, "Invalid remarks hotness threshold: %s",
+ opt.data());
else
RemarksHotnessThreshold = *ResultOrErr;
} else if (opt.consume_front("opt-remarks-format=")) {
@@ -319,7 +320,7 @@ namespace options {
} else if (opt.consume_front("time-trace-granularity=")) {
unsigned Granularity;
if (opt.getAsInteger(10, Granularity))
- message(LDPL_FATAL, "Invalid time trace granularity: %s", opt);
+ message(LDPL_FATAL, "Invalid time trace granularity: %s", opt.data());
else
time_trace_granularity = Granularity;
} else {
|
lipracer
reviewed
Jun 11, 2024
| @@ -307,7 +307,8 @@ namespace options { | |||
| } else if (opt.consume_front("opt-remarks-hotness-threshold=")) { | |||
| auto ResultOrErr = remarks::parseHotnessThresholdOption(opt); | |||
| if (!ResultOrErr) | |||
| message(LDPL_FATAL, "Invalid remarks hotness threshold: %s", opt); | |||
| message(LDPL_FATAL, "Invalid remarks hotness threshold: %s", | |||
| opt.data()); | |||
There was a problem hiding this comment.
Can we directly use the variable opt_?
There was a problem hiding this comment.
No, that would also include the opt-remarks-hotness-threshold= prefix.
lipracer
approved these changes
Jun 11, 2024
Closed
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.
This is a printf style variadic function. If using a "%s" format, we should pass "const char *" rather than "StringRef".
The use of data() here is safe because we know that the StringRef was originally derived from a null-terminated string.