Skip to content

[RISCV] Use Twine concatentation for error messages in RISCVISAInfo. #79956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2024
Merged

[RISCV] Use Twine concatentation for error messages in RISCVISAInfo. #79956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions llvm/lib/Support/RISCVISAInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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()) + "'");
}
}
}
Expand All @@ -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);
}
Expand Down