Skip to content

Commit 2e16500

Browse files
authored
[RISCV] Use Twine concatentation for error messages in RISCVISAInfo. (#79956)
This avoids converting StringRef to std::string to const char*.
1 parent 7dc7fc0 commit 2e16500

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

llvm/lib/Support/RISCVISAInfo.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -743,8 +743,7 @@ static Error processMultiLetterExtension(
743743

744744
if (!IgnoreUnknown && Name.size() == Type.size())
745745
return createStringError(errc::invalid_argument,
746-
"%s name missing after '%s'", Desc.str().c_str(),
747-
Type.str().c_str());
746+
Desc + " name missing after '" + Type + "'");
748747

749748
unsigned Major, Minor, ConsumeLength;
750749
if (auto E = getExtensionVersion(Name, Vers, Major, Minor, ConsumeLength,
@@ -759,8 +758,8 @@ static Error processMultiLetterExtension(
759758

760759
// Check if duplicated extension.
761760
if (!IgnoreUnknown && SeenExtMap.contains(Name.str()))
762-
return createStringError(errc::invalid_argument, "duplicated %s '%s'",
763-
Desc.str().c_str(), Name.str().c_str());
761+
return createStringError(errc::invalid_argument,
762+
"duplicated " + Desc + " '" + Name + "'");
764763

765764
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension(Name))
766765
return Error::success();
@@ -794,8 +793,8 @@ static Error processSingleLetterExtension(
794793
// Check if duplicated extension.
795794
if (!IgnoreUnknown && SeenExtMap.contains(Name.str()))
796795
return createStringError(errc::invalid_argument,
797-
"duplicated standard user-level extension '%s'",
798-
Name.str().c_str());
796+
"duplicated standard user-level extension '" +
797+
Name + "'");
799798

800799
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension(Name))
801800
return Error::success();
@@ -928,8 +927,8 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
928927
} else {
929928
// FIXME: Could it be ignored by IgnoreUnknown?
930929
return createStringError(errc::invalid_argument,
931-
"invalid standard user-level extension '%c'",
932-
CurrExt.front());
930+
"invalid standard user-level extension '" +
931+
Twine(CurrExt.front()) + "'");
933932
}
934933
}
935934
}
@@ -941,13 +940,13 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
941940

942941
if (!RISCVISAInfo::isSupportedExtension(ExtName)) {
943942
if (ExtName.size() == 1) {
944-
return createStringError(
945-
errc::invalid_argument,
946-
"unsupported standard user-level extension '%s'", ExtName.c_str());
943+
return createStringError(errc::invalid_argument,
944+
"unsupported standard user-level extension '" +
945+
ExtName + "'");
947946
}
948-
return createStringError(errc::invalid_argument, "unsupported %s '%s'",
949-
getExtensionTypeDesc(ExtName).str().c_str(),
950-
ExtName.c_str());
947+
return createStringError(errc::invalid_argument,
948+
"unsupported " + getExtensionTypeDesc(ExtName) +
949+
" '" + ExtName + "'");
951950
}
952951
ISAInfo->addExtension(ExtName, ExtVers);
953952
}

0 commit comments

Comments
 (0)