Skip to content

Commit 9bb5af8

Browse files
committed
[TableGen] Replace StringRef::slice with substr. NFC
1 parent 6da5968 commit 9bb5af8

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

llvm/utils/TableGen/AsmMatcherEmitter.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ void MatchableInfo::tokenizeAsmString(const AsmMatcherInfo &Info,
10011001
char Char = String[i];
10021002
if (Variant.BreakCharacters.contains(Char)) {
10031003
if (InTok) {
1004-
addAsmOperand(String.slice(Prev, i), false);
1004+
addAsmOperand(String.substr(Prev, i - Prev), false);
10051005
Prev = i;
10061006
IsIsolatedToken = false;
10071007
}
@@ -1010,7 +1010,7 @@ void MatchableInfo::tokenizeAsmString(const AsmMatcherInfo &Info,
10101010
}
10111011
if (Variant.TokenizingCharacters.contains(Char)) {
10121012
if (InTok) {
1013-
addAsmOperand(String.slice(Prev, i), IsIsolatedToken);
1013+
addAsmOperand(String.substr(Prev, i - Prev), IsIsolatedToken);
10141014
InTok = false;
10151015
IsIsolatedToken = false;
10161016
}
@@ -1021,7 +1021,7 @@ void MatchableInfo::tokenizeAsmString(const AsmMatcherInfo &Info,
10211021
}
10221022
if (Variant.SeparatorCharacters.contains(Char)) {
10231023
if (InTok) {
1024-
addAsmOperand(String.slice(Prev, i), IsIsolatedToken);
1024+
addAsmOperand(String.substr(Prev, i - Prev), IsIsolatedToken);
10251025
InTok = false;
10261026
}
10271027
Prev = i + 1;
@@ -1032,7 +1032,7 @@ void MatchableInfo::tokenizeAsmString(const AsmMatcherInfo &Info,
10321032
switch (Char) {
10331033
case '\\':
10341034
if (InTok) {
1035-
addAsmOperand(String.slice(Prev, i), false);
1035+
addAsmOperand(String.substr(Prev, i - Prev), false);
10361036
InTok = false;
10371037
IsIsolatedToken = false;
10381038
}
@@ -1045,7 +1045,7 @@ void MatchableInfo::tokenizeAsmString(const AsmMatcherInfo &Info,
10451045

10461046
case '$': {
10471047
if (InTok) {
1048-
addAsmOperand(String.slice(Prev, i), IsIsolatedToken);
1048+
addAsmOperand(String.substr(Prev, i - Prev), IsIsolatedToken);
10491049
InTok = false;
10501050
IsIsolatedToken = false;
10511051
}
@@ -1059,7 +1059,7 @@ void MatchableInfo::tokenizeAsmString(const AsmMatcherInfo &Info,
10591059
size_t EndPos = String.find('}', i);
10601060
assert(EndPos != StringRef::npos &&
10611061
"Missing brace in operand reference!");
1062-
addAsmOperand(String.slice(i, EndPos + 1), IsIsolatedToken);
1062+
addAsmOperand(String.substr(i, EndPos + 1 - i), IsIsolatedToken);
10631063
Prev = EndPos + 1;
10641064
i = EndPos;
10651065
IsIsolatedToken = false;

llvm/utils/TableGen/Common/CodeGenInstruction.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,8 @@ std::string CodeGenInstruction::FlattenAsmStringVariants(StringRef Cur,
566566
}
567567

568568
// Select the Nth variant (or empty).
569-
StringRef Selection = Cur.slice(VariantsStart, VariantsEnd);
569+
StringRef Selection =
570+
Cur.substr(VariantsStart, VariantsEnd - VariantsStart);
570571
for (unsigned i = 0; i != Variant; ++i)
571572
Selection = Selection.split('|').second;
572573
Res += Selection.split('|').first;

0 commit comments

Comments
 (0)