Skip to content

Commit 4c21d0c

Browse files
kuharkuhar
authored
[ADT] Prepare to deprecate variadic StringSwitch::Cases. NFC. (#166020)
Update all uses of variadic `.Cases` to use the initializer list overload instead. I plan to mark variadic `.Cases` as deprecated in a followup PR. For more context, see #163117.
1 parent 8331c73 commit 4c21d0c

File tree

46 files changed

+243
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+243
-240
lines changed

‎bolt/lib/Profile/DataAggregator.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,8 @@ std::error_code DataAggregator::parseAggregatedLBREntry() {
13211321
}
13221322

13231323
using SSI = StringSwitch<int>;
1324-
AddrNum = SSI(Str).Cases("T", "R", 3).Case("S", 1).Case("E", 0).Default(2);
1324+
AddrNum =
1325+
SSI(Str).Cases({"T", "R"}, 3).Case("S", 1).Case("E", 0).Default(2);
13251326
CounterNum = SSI(Str).Case("B", 2).Case("E", 0).Default(1);
13261327
}
13271328

‎clang-tools-extra/clang-tidy/bugprone/UncheckedStringToNumberConversionCheck.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ enum class ConversionKind {
5151

5252
static ConversionKind classifyConversionFunc(const FunctionDecl *FD) {
5353
return llvm::StringSwitch<ConversionKind>(FD->getName())
54-
.Cases("atoi", "atol", ConversionKind::ToInt)
54+
.Cases({"atoi", "atol"}, ConversionKind::ToInt)
5555
.Case("atoll", ConversionKind::ToLongInt)
5656
.Case("atof", ConversionKind::ToDouble)
5757
.Default(ConversionKind::None);

‎clang-tools-extra/clangd/support/DirectiveTree.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ class BranchChooser {
305305
if (&Value >= Tokens.end() || &Value.nextNC() < Tokens.end())
306306
return std::nullopt;
307307
return llvm::StringSwitch<std::optional<bool>>(Value.text())
308-
.Cases("true", "1", true)
309-
.Cases("false", "0", false)
308+
.Cases({"true", "1"}, true)
309+
.Cases({"false", "0"}, false)
310310
.Default(std::nullopt);
311311
}
312312

‎clang/lib/AST/CommentSema.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static ParamCommandPassDirection getParamPassDirection(StringRef Arg) {
225225
return llvm::StringSwitch<ParamCommandPassDirection>(Arg)
226226
.Case("[in]", ParamCommandPassDirection::In)
227227
.Case("[out]", ParamCommandPassDirection::Out)
228-
.Cases("[in,out]", "[out,in]", ParamCommandPassDirection::InOut)
228+
.Cases({"[in,out]", "[out,in]"}, ParamCommandPassDirection::InOut)
229229
.Default(static_cast<ParamCommandPassDirection>(-1));
230230
}
231231

‎clang/lib/Basic/Targets/NVPTX.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ArrayRef<const char *> NVPTXTargetInfo::getGCCRegNames() const {
171171

172172
bool NVPTXTargetInfo::hasFeature(StringRef Feature) const {
173173
return llvm::StringSwitch<bool>(Feature)
174-
.Cases("ptx", "nvptx", true)
174+
.Cases({"ptx", "nvptx"}, true)
175175
.Default(false);
176176
}
177177

‎clang/lib/Basic/Targets/PPC.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,8 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetInfo : public TargetInfo {
125125
.Cases({"power3", "pwr3"}, ArchDefinePpcgr)
126126
.Cases({"power4", "pwr4"},
127127
ArchDefinePwr4 | ArchDefinePpcgr | ArchDefinePpcsq)
128-
.Cases("power5", "pwr5",
129-
ArchDefinePwr5 | ArchDefinePwr4 | ArchDefinePpcgr |
130-
ArchDefinePpcsq)
128+
.Cases({"power5", "pwr5"}, ArchDefinePwr5 | ArchDefinePwr4 |
129+
ArchDefinePpcgr | ArchDefinePpcsq)
131130
.Cases({"power5x", "pwr5x"},
132131
ArchDefinePwr5x | ArchDefinePwr5 | ArchDefinePwr4 |
133132
ArchDefinePpcgr | ArchDefinePpcsq)
@@ -166,7 +165,7 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetInfo : public TargetInfo {
166165
ArchDefinePwr9 | ArchDefinePwr8 | ArchDefinePwr7 |
167166
ArchDefinePwr6 | ArchDefinePwr5x | ArchDefinePwr5 |
168167
ArchDefinePwr4 | ArchDefinePpcgr | ArchDefinePpcsq)
169-
.Cases("8548", "e500", ArchDefineE500)
168+
.Cases({"8548", "e500"}, ArchDefineE500)
170169
.Default(ArchDefineNone);
171170
}
172171
return CPUKnown;

‎clang/lib/CodeGen/BackendUtil.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ getCodeModel(const CodeGenOptions &CodeGenOpts) {
313313
.Case("kernel", llvm::CodeModel::Kernel)
314314
.Case("medium", llvm::CodeModel::Medium)
315315
.Case("large", llvm::CodeModel::Large)
316-
.Cases("default", "", ~1u)
316+
.Cases({"default", ""}, ~1u)
317317
.Default(~0u);
318318
assert(CodeModel != ~0u && "invalid code model!");
319319
if (CodeModel == ~1u)

‎clang/lib/Driver/ToolChains/Arch/M68k.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ std::string m68k::getM68kTargetCPU(const ArgList &Args) {
3636
return "generic";
3737

3838
return llvm::StringSwitch<std::string>(CPUName)
39-
.Cases("m68000", "68000", "M68000")
40-
.Cases("m68010", "68010", "M68010")
41-
.Cases("m68020", "68020", "M68020")
42-
.Cases("m68030", "68030", "M68030")
43-
.Cases("m68040", "68040", "M68040")
44-
.Cases("m68060", "68060", "M68060")
39+
.Cases({"m68000", "68000"}, "M68000")
40+
.Cases({"m68010", "68010"}, "M68010")
41+
.Cases({"m68020", "68020"}, "M68020")
42+
.Cases({"m68030", "68030"}, "M68030")
43+
.Cases({"m68040", "68040"}, "M68040")
44+
.Cases({"m68060", "68060"}, "M68060")
4545
.Default(CPUName.str());
4646
}
4747
// FIXME: Throw error when multiple sub-architecture flag exist

‎clang/lib/Driver/ToolChains/Arch/Mips.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void mips::getMipsCPUAndABI(const ArgList &Args, const llvm::Triple &Triple,
117117
// Deduce CPU name from ABI name.
118118
CPUName = llvm::StringSwitch<const char *>(ABIName)
119119
.Case("o32", DefMips32CPU)
120-
.Cases("n32", "n64", DefMips64CPU)
120+
.Cases({"n32", "n64"}, DefMips64CPU)
121121
.Default("");
122122
}
123123

@@ -467,7 +467,7 @@ bool mips::isNaN2008(const Driver &D, const ArgList &Args,
467467

468468
// NaN2008 is the default for MIPS32r6/MIPS64r6.
469469
return llvm::StringSwitch<bool>(getCPUName(D, Args, Triple))
470-
.Cases("mips32r6", "mips64r6", true)
470+
.Cases({"mips32r6", "mips64r6"}, true)
471471
.Default(false);
472472
}
473473

‎clang/lib/Driver/ToolChains/Darwin.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,12 +1035,12 @@ static const char *ArmMachOArchName(StringRef Arch) {
10351035
.Case("xscale", "xscale")
10361036
.Case("armv4t", "armv4t")
10371037
.Case("armv7", "armv7")
1038-
.Cases("armv7a", "armv7-a", "armv7")
1039-
.Cases("armv7r", "armv7-r", "armv7")
1040-
.Cases("armv7em", "armv7e-m", "armv7em")
1041-
.Cases("armv7k", "armv7-k", "armv7k")
1042-
.Cases("armv7m", "armv7-m", "armv7m")
1043-
.Cases("armv7s", "armv7-s", "armv7s")
1038+
.Cases({"armv7a", "armv7-a"}, "armv7")
1039+
.Cases({"armv7r", "armv7-r"}, "armv7")
1040+
.Cases({"armv7em", "armv7e-m"}, "armv7em")
1041+
.Cases({"armv7k", "armv7-k"}, "armv7k")
1042+
.Cases({"armv7m", "armv7-m"}, "armv7m")
1043+
.Cases({"armv7s", "armv7-s"}, "armv7s")
10441044
.Default(nullptr);
10451045
}
10461046

0 commit comments

Comments
 (0)