@@ -743,8 +743,7 @@ static Error processMultiLetterExtension(
743
743
744
744
if (!IgnoreUnknown && Name.size () == Type.size ())
745
745
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 + " '" );
748
747
749
748
unsigned Major, Minor, ConsumeLength;
750
749
if (auto E = getExtensionVersion (Name, Vers, Major, Minor, ConsumeLength,
@@ -759,8 +758,8 @@ static Error processMultiLetterExtension(
759
758
760
759
// Check if duplicated extension.
761
760
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 + " ' " );
764
763
765
764
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension (Name))
766
765
return Error::success ();
@@ -794,8 +793,8 @@ static Error processSingleLetterExtension(
794
793
// Check if duplicated extension.
795
794
if (!IgnoreUnknown && SeenExtMap.contains (Name.str ()))
796
795
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 + " ' " );
799
798
800
799
if (IgnoreUnknown && !RISCVISAInfo::isSupportedExtension (Name))
801
800
return Error::success ();
@@ -928,8 +927,8 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
928
927
} else {
929
928
// FIXME: Could it be ignored by IgnoreUnknown?
930
929
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 ()) + " ' " );
933
932
}
934
933
}
935
934
}
@@ -941,13 +940,13 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
941
940
942
941
if (!RISCVISAInfo::isSupportedExtension (ExtName)) {
943
942
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 + " ' " );
947
946
}
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 + " ' " );
951
950
}
952
951
ISAInfo->addExtension (ExtName, ExtVers);
953
952
}
0 commit comments