[RISCV] Use Twine concatentation for error messages in RISCVISAInfo. #79956
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 avoids converting StringRef to std::string to const char*.
|
@llvm/pr-subscribers-llvm-support Author: Craig Topper (topperc) ChangesThis avoids converting StringRef to std::string to const char*. Full diff: https://github.com/llvm/llvm-project/pull/79956.diff 1 Files Affected:
diff --git a/llvm/lib/Support/RISCVISAInfo.cpp b/llvm/lib/Support/RISCVISAInfo.cpp
index 050253f78399e..a1a165065a081 100644
--- a/llvm/lib/Support/RISCVISAInfo.cpp
+++ b/llvm/lib/Support/RISCVISAInfo.cpp
@@ -743,8 +743,7 @@ static Error processMultiLetterExtension(
if (!IgnoreUnknown && Name.size() == Type.size())
return createStringError(errc::invalid_argument,
- "%s name missing after '%s'", Desc.str().c_str(),
- Type.str().c_str());
+ Desc + " name missing after '" + Type + "'");
unsigned Major, Minor, ConsumeLength;
if (auto E = getExtensionVersion(Name, Vers, Major, Minor, ConsumeLength,
@@ -759,8 +758,8 @@ static Error processMultiLetterExtension(
// Check if duplicated extension.
if (!IgnoreUnknown && SeenExtMap.contains(Name.str()))
- return createStringError(errc::invalid_argument, "duplicated %s '%s'",
- Desc.str().c_str(), Name.str().c_str());
+ return createStringError(errc::invalid_argument,
+ "duplicated " + Desc + " '" + Name + "'");
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension(Name))
return Error::success();
@@ -794,8 +793,8 @@ static Error processSingleLetterExtension(
// Check if duplicated extension.
if (!IgnoreUnknown && SeenExtMap.contains(Name.str()))
return createStringError(errc::invalid_argument,
- "duplicated standard user-level extension '%s'",
- Name.str().c_str());
+ "duplicated standard user-level extension '" +
+ Name + "'");
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension(Name))
return Error::success();
@@ -928,8 +927,8 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
} else {
// FIXME: Could it be ignored by IgnoreUnknown?
return createStringError(errc::invalid_argument,
- "invalid standard user-level extension '%c'",
- CurrExt.front());
+ "invalid standard user-level extension '" +
+ Twine(CurrExt.front()) + "'");
}
}
}
@@ -941,13 +940,13 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
if (!RISCVISAInfo::isSupportedExtension(ExtName)) {
if (ExtName.size() == 1) {
- return createStringError(
- errc::invalid_argument,
- "unsupported standard user-level extension '%s'", ExtName.c_str());
+ return createStringError(errc::invalid_argument,
+ "unsupported standard user-level extension '" +
+ ExtName + "'");
}
- return createStringError(errc::invalid_argument, "unsupported %s '%s'",
- getExtensionTypeDesc(ExtName).str().c_str(),
- ExtName.c_str());
+ return createStringError(errc::invalid_argument,
+ "unsupported " + getExtensionTypeDesc(ExtName) +
+ " '" + ExtName + "'");
}
ISAInfo->addExtension(ExtName, ExtVers);
}
|
|
@llvm/pr-subscribers-backend-risc-v Author: Craig Topper (topperc) ChangesThis avoids converting StringRef to std::string to const char*. Full diff: https://github.com/llvm/llvm-project/pull/79956.diff 1 Files Affected:
diff --git a/llvm/lib/Support/RISCVISAInfo.cpp b/llvm/lib/Support/RISCVISAInfo.cpp
index 050253f78399e..a1a165065a081 100644
--- a/llvm/lib/Support/RISCVISAInfo.cpp
+++ b/llvm/lib/Support/RISCVISAInfo.cpp
@@ -743,8 +743,7 @@ static Error processMultiLetterExtension(
if (!IgnoreUnknown && Name.size() == Type.size())
return createStringError(errc::invalid_argument,
- "%s name missing after '%s'", Desc.str().c_str(),
- Type.str().c_str());
+ Desc + " name missing after '" + Type + "'");
unsigned Major, Minor, ConsumeLength;
if (auto E = getExtensionVersion(Name, Vers, Major, Minor, ConsumeLength,
@@ -759,8 +758,8 @@ static Error processMultiLetterExtension(
// Check if duplicated extension.
if (!IgnoreUnknown && SeenExtMap.contains(Name.str()))
- return createStringError(errc::invalid_argument, "duplicated %s '%s'",
- Desc.str().c_str(), Name.str().c_str());
+ return createStringError(errc::invalid_argument,
+ "duplicated " + Desc + " '" + Name + "'");
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension(Name))
return Error::success();
@@ -794,8 +793,8 @@ static Error processSingleLetterExtension(
// Check if duplicated extension.
if (!IgnoreUnknown && SeenExtMap.contains(Name.str()))
return createStringError(errc::invalid_argument,
- "duplicated standard user-level extension '%s'",
- Name.str().c_str());
+ "duplicated standard user-level extension '" +
+ Name + "'");
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension(Name))
return Error::success();
@@ -928,8 +927,8 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
} else {
// FIXME: Could it be ignored by IgnoreUnknown?
return createStringError(errc::invalid_argument,
- "invalid standard user-level extension '%c'",
- CurrExt.front());
+ "invalid standard user-level extension '" +
+ Twine(CurrExt.front()) + "'");
}
}
}
@@ -941,13 +940,13 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
if (!RISCVISAInfo::isSupportedExtension(ExtName)) {
if (ExtName.size() == 1) {
- return createStringError(
- errc::invalid_argument,
- "unsupported standard user-level extension '%s'", ExtName.c_str());
+ return createStringError(errc::invalid_argument,
+ "unsupported standard user-level extension '" +
+ ExtName + "'");
}
- return createStringError(errc::invalid_argument, "unsupported %s '%s'",
- getExtensionTypeDesc(ExtName).str().c_str(),
- ExtName.c_str());
+ return createStringError(errc::invalid_argument,
+ "unsupported " + getExtensionTypeDesc(ExtName) +
+ " '" + ExtName + "'");
}
ISAInfo->addExtension(ExtName, ExtVers);
}
|
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 avoids converting StringRef to std::string to const char*.