Skip to content

[ADT] Prepare to deprecate variadic StringSwitch::Cases. NFC. #166020

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
Nov 2, 2025
Merged

[ADT] Prepare to deprecate variadic StringSwitch::Cases. NFC. #166020

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion bolt/lib/Profile/DataAggregator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,8 @@ std::error_code DataAggregator::parseAggregatedLBREntry() {
}

using SSI = StringSwitch<int>;
AddrNum = SSI(Str).Cases("T", "R", 3).Case("S", 1).Case("E", 0).Default(2);
AddrNum =
SSI(Str).Cases({"T", "R"}, 3).Case("S", 1).Case("E", 0).Default(2);
CounterNum = SSI(Str).Case("B", 2).Case("E", 0).Default(1);
}

Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-tidy/bugprone/UncheckedStringToNumberConversionCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ enum class ConversionKind {

static ConversionKind classifyConversionFunc(const FunctionDecl *FD) {
return llvm::StringSwitch<ConversionKind>(FD->getName())
.Cases("atoi", "atol", ConversionKind::ToInt)
.Cases({"atoi", "atol"}, ConversionKind::ToInt)
.Case("atoll", ConversionKind::ToLongInt)
.Case("atof", ConversionKind::ToDouble)
.Default(ConversionKind::None);
Expand Down
4 changes: 2 additions & 2 deletions clang-tools-extra/clangd/support/DirectiveTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ class BranchChooser {
if (&Value >= Tokens.end() || &Value.nextNC() < Tokens.end())
return std::nullopt;
return llvm::StringSwitch<std::optional<bool>>(Value.text())
.Cases("true", "1", true)
.Cases("false", "0", false)
.Cases({"true", "1"}, true)
.Cases({"false", "0"}, false)
.Default(std::nullopt);
}

Expand Down
2 changes: 1 addition & 1 deletion clang/lib/AST/CommentSema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ static ParamCommandPassDirection getParamPassDirection(StringRef Arg) {
return llvm::StringSwitch<ParamCommandPassDirection>(Arg)
.Case("[in]", ParamCommandPassDirection::In)
.Case("[out]", ParamCommandPassDirection::Out)
.Cases("[in,out]", "[out,in]", ParamCommandPassDirection::InOut)
.Cases({"[in,out]", "[out,in]"}, ParamCommandPassDirection::InOut)
.Default(static_cast<ParamCommandPassDirection>(-1));
}

Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Basic/Targets/NVPTX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ ArrayRef<const char *> NVPTXTargetInfo::getGCCRegNames() const {

bool NVPTXTargetInfo::hasFeature(StringRef Feature) const {
return llvm::StringSwitch<bool>(Feature)
.Cases("ptx", "nvptx", true)
.Cases({"ptx", "nvptx"}, true)
.Default(false);
}

Expand Down
7 changes: 3 additions & 4 deletions clang/lib/Basic/Targets/PPC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetInfo : public TargetInfo {
.Cases({"power3", "pwr3"}, ArchDefinePpcgr)
.Cases({"power4", "pwr4"},
ArchDefinePwr4 | ArchDefinePpcgr | ArchDefinePpcsq)
.Cases("power5", "pwr5",
ArchDefinePwr5 | ArchDefinePwr4 | ArchDefinePpcgr |
ArchDefinePpcsq)
.Cases({"power5", "pwr5"}, ArchDefinePwr5 | ArchDefinePwr4 |
ArchDefinePpcgr | ArchDefinePpcsq)
.Cases({"power5x", "pwr5x"},
ArchDefinePwr5x | ArchDefinePwr5 | ArchDefinePwr4 |
ArchDefinePpcgr | ArchDefinePpcsq)
Expand Down Expand Up @@ -166,7 +165,7 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetInfo : public TargetInfo {
ArchDefinePwr9 | ArchDefinePwr8 | ArchDefinePwr7 |
ArchDefinePwr6 | ArchDefinePwr5x | ArchDefinePwr5 |
ArchDefinePwr4 | ArchDefinePpcgr | ArchDefinePpcsq)
.Cases("8548", "e500", ArchDefineE500)
.Cases({"8548", "e500"}, ArchDefineE500)
.Default(ArchDefineNone);
}
return CPUKnown;
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/CodeGen/BackendUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ getCodeModel(const CodeGenOptions &CodeGenOpts) {
.Case("kernel", llvm::CodeModel::Kernel)
.Case("medium", llvm::CodeModel::Medium)
.Case("large", llvm::CodeModel::Large)
.Cases("default", "", ~1u)
.Cases({"default", ""}, ~1u)
.Default(~0u);
assert(CodeModel != ~0u && "invalid code model!");
if (CodeModel == ~1u)
Expand Down
12 changes: 6 additions & 6 deletions clang/lib/Driver/ToolChains/Arch/M68k.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ std::string m68k::getM68kTargetCPU(const ArgList &Args) {
return "generic";

return llvm::StringSwitch<std::string>(CPUName)
.Cases("m68000", "68000", "M68000")
.Cases("m68010", "68010", "M68010")
.Cases("m68020", "68020", "M68020")
.Cases("m68030", "68030", "M68030")
.Cases("m68040", "68040", "M68040")
.Cases("m68060", "68060", "M68060")
.Cases({"m68000", "68000"}, "M68000")
.Cases({"m68010", "68010"}, "M68010")
.Cases({"m68020", "68020"}, "M68020")
.Cases({"m68030", "68030"}, "M68030")
.Cases({"m68040", "68040"}, "M68040")
.Cases({"m68060", "68060"}, "M68060")
.Default(CPUName.str());
}
// FIXME: Throw error when multiple sub-architecture flag exist
Expand Down
4 changes: 2 additions & 2 deletions clang/lib/Driver/ToolChains/Arch/Mips.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void mips::getMipsCPUAndABI(const ArgList &Args, const llvm::Triple &Triple,
// Deduce CPU name from ABI name.
CPUName = llvm::StringSwitch<const char *>(ABIName)
.Case("o32", DefMips32CPU)
.Cases("n32", "n64", DefMips64CPU)
.Cases({"n32", "n64"}, DefMips64CPU)
.Default("");
}

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

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

Expand Down
12 changes: 6 additions & 6 deletions clang/lib/Driver/ToolChains/Darwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,12 +1035,12 @@ static const char *ArmMachOArchName(StringRef Arch) {
.Case("xscale", "xscale")
.Case("armv4t", "armv4t")
.Case("armv7", "armv7")
.Cases("armv7a", "armv7-a", "armv7")
.Cases("armv7r", "armv7-r", "armv7")
.Cases("armv7em", "armv7e-m", "armv7em")
.Cases("armv7k", "armv7-k", "armv7k")
.Cases("armv7m", "armv7-m", "armv7m")
.Cases("armv7s", "armv7-s", "armv7s")
.Cases({"armv7a", "armv7-a"}, "armv7")
.Cases({"armv7r", "armv7-r"}, "armv7")
.Cases({"armv7em", "armv7e-m"}, "armv7em")
.Cases({"armv7k", "armv7-k"}, "armv7k")
.Cases({"armv7m", "armv7-m"}, "armv7m")
.Cases({"armv7s", "armv7-s"}, "armv7s")
.Default(nullptr);
}

Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Driver/ToolChains/Solaris.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ SanitizerMask Solaris::getSupportedSanitizers() const {
const char *Solaris::getDefaultLinker() const {
// FIXME: Only handle Solaris ld and GNU ld here.
return llvm::StringSwitch<const char *>(getDriver().getPreferredLinker())
.Cases("bfd", "gld", "/usr/gnu/bin/ld")
.Cases({"bfd", "gld"}, "/usr/gnu/bin/ld")
.Default("/usr/bin/ld");
}

Expand Down
24 changes: 12 additions & 12 deletions clang/lib/Frontend/CompilerInvocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4049,18 +4049,18 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
// -cl-std only applies for OpenCL language standards.
// Override the -std option in this case.
if (const Arg *A = Args.getLastArg(OPT_cl_std_EQ)) {
LangStandard::Kind OpenCLLangStd
= llvm::StringSwitch<LangStandard::Kind>(A->getValue())
.Cases("cl", "CL", LangStandard::lang_opencl10)
.Cases("cl1.0", "CL1.0", LangStandard::lang_opencl10)
.Cases("cl1.1", "CL1.1", LangStandard::lang_opencl11)
.Cases("cl1.2", "CL1.2", LangStandard::lang_opencl12)
.Cases("cl2.0", "CL2.0", LangStandard::lang_opencl20)
.Cases("cl3.0", "CL3.0", LangStandard::lang_opencl30)
.Cases("clc++", "CLC++", LangStandard::lang_openclcpp10)
.Cases("clc++1.0", "CLC++1.0", LangStandard::lang_openclcpp10)
.Cases("clc++2021", "CLC++2021", LangStandard::lang_openclcpp2021)
.Default(LangStandard::lang_unspecified);
LangStandard::Kind OpenCLLangStd =
llvm::StringSwitch<LangStandard::Kind>(A->getValue())
.Cases({"cl", "CL"}, LangStandard::lang_opencl10)
.Cases({"cl1.0", "CL1.0"}, LangStandard::lang_opencl10)
.Cases({"cl1.1", "CL1.1"}, LangStandard::lang_opencl11)
.Cases({"cl1.2", "CL1.2"}, LangStandard::lang_opencl12)
.Cases({"cl2.0", "CL2.0"}, LangStandard::lang_opencl20)
.Cases({"cl3.0", "CL3.0"}, LangStandard::lang_opencl30)
.Cases({"clc++", "CLC++"}, LangStandard::lang_openclcpp10)
.Cases({"clc++1.0", "CLC++1.0"}, LangStandard::lang_openclcpp10)
.Cases({"clc++2021", "CLC++2021"}, LangStandard::lang_openclcpp2021)
.Default(LangStandard::lang_unspecified);

if (OpenCLLangStd == LangStandard::lang_unspecified) {
Diags.Report(diag::err_drv_invalid_value)
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Tooling/DependencyScanning/DependencyScannerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ void sanitizeDiagOpts(DiagnosticOptions &DiagOpts) {
// See `test/ClangScanDeps/diagnostic-pragmas.c` for an example.
llvm::erase_if(DiagOpts.Warnings, [](StringRef Warning) {
return llvm::StringSwitch<bool>(Warning)
.Cases("pch-vfs-diff", "error=pch-vfs-diff", false)
.Cases({"pch-vfs-diff", "error=pch-vfs-diff"}, false)
.StartsWith("no-error=", false)
.Default(true);
});
Expand Down
2 changes: 1 addition & 1 deletion clang/unittests/Driver/MultilibTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ TEST(MultilibTest, SetPushback) {
ASSERT_TRUE(MS.size() == 2);
for (MultilibSet::const_iterator I = MS.begin(), E = MS.end(); I != E; ++I) {
ASSERT_TRUE(llvm::StringSwitch<bool>(I->gccSuffix())
.Cases("/one", "/two", true)
.Cases({"/one", "/two"}, true)
.Default(false));
}
}
Expand Down
18 changes: 9 additions & 9 deletions lld/ELF/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,23 +156,23 @@ static std::tuple<ELFKind, uint16_t, uint8_t> parseEmulation(Ctx &ctx,

std::pair<ELFKind, uint16_t> ret =
StringSwitch<std::pair<ELFKind, uint16_t>>(s)
.Cases("aarch64elf", "aarch64linux", {ELF64LEKind, EM_AARCH64})
.Cases("aarch64elfb", "aarch64linuxb", {ELF64BEKind, EM_AARCH64})
.Cases("armelf", "armelf_linux_eabi", {ELF32LEKind, EM_ARM})
.Cases("armelfb", "armelfb_linux_eabi", {ELF32BEKind, EM_ARM})
.Cases({"aarch64elf", "aarch64linux"}, {ELF64LEKind, EM_AARCH64})
.Cases({"aarch64elfb", "aarch64linuxb"}, {ELF64BEKind, EM_AARCH64})
.Cases({"armelf", "armelf_linux_eabi"}, {ELF32LEKind, EM_ARM})
.Cases({"armelfb", "armelfb_linux_eabi"}, {ELF32BEKind, EM_ARM})
.Case("elf32_x86_64", {ELF32LEKind, EM_X86_64})
.Cases("elf32btsmip", "elf32btsmipn32", {ELF32BEKind, EM_MIPS})
.Cases("elf32ltsmip", "elf32ltsmipn32", {ELF32LEKind, EM_MIPS})
.Cases({"elf32btsmip", "elf32btsmipn32"}, {ELF32BEKind, EM_MIPS})
.Cases({"elf32ltsmip", "elf32ltsmipn32"}, {ELF32LEKind, EM_MIPS})
.Case("elf32lriscv", {ELF32LEKind, EM_RISCV})
.Cases("elf32ppc", "elf32ppclinux", {ELF32BEKind, EM_PPC})
.Cases("elf32lppc", "elf32lppclinux", {ELF32LEKind, EM_PPC})
.Cases({"elf32ppc", "elf32ppclinux"}, {ELF32BEKind, EM_PPC})
.Cases({"elf32lppc", "elf32lppclinux"}, {ELF32LEKind, EM_PPC})
.Case("elf32loongarch", {ELF32LEKind, EM_LOONGARCH})
.Case("elf64btsmip", {ELF64BEKind, EM_MIPS})
.Case("elf64ltsmip", {ELF64LEKind, EM_MIPS})
.Case("elf64lriscv", {ELF64LEKind, EM_RISCV})
.Case("elf64ppc", {ELF64BEKind, EM_PPC64})
.Case("elf64lppc", {ELF64LEKind, EM_PPC64})
.Cases("elf_amd64", "elf_x86_64", {ELF64LEKind, EM_X86_64})
.Cases({"elf_amd64", "elf_x86_64"}, {ELF64LEKind, EM_X86_64})
.Case("elf_i386", {ELF32LEKind, EM_386})
.Case("elf_iamcu", {ELF32LEKind, EM_IAMCU})
.Case("elf64_sparc", {ELF64BEKind, EM_SPARCV9})
Expand Down
7 changes: 4 additions & 3 deletions lld/ELF/ScriptParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ static std::pair<ELFKind, uint16_t> parseBfdName(StringRef s) {
.Case("elf64-powerpc", {ELF64BEKind, EM_PPC64})
.Case("elf64-powerpcle", {ELF64LEKind, EM_PPC64})
.Case("elf64-x86-64", {ELF64LEKind, EM_X86_64})
.Cases("elf32-tradbigmips", "elf32-bigmips", {ELF32BEKind, EM_MIPS})
.Cases({"elf32-tradbigmips", "elf32-bigmips"}, {ELF32BEKind, EM_MIPS})
.Case("elf32-ntradbigmips", {ELF32BEKind, EM_MIPS})
.Case("elf32-tradlittlemips", {ELF32LEKind, EM_MIPS})
.Case("elf32-ntradlittlemips", {ELF32LEKind, EM_MIPS})
Expand All @@ -463,7 +463,8 @@ static std::pair<ELFKind, uint16_t> parseBfdName(StringRef s) {
.Case("elf32-loongarch", {ELF32LEKind, EM_LOONGARCH})
.Case("elf64-loongarch", {ELF64LEKind, EM_LOONGARCH})
.Case("elf64-s390", {ELF64BEKind, EM_S390})
.Cases("elf32-hexagon", "elf32-littlehexagon", {ELF32LEKind, EM_HEXAGON})
.Cases({"elf32-hexagon", "elf32-littlehexagon"},
{ELF32LEKind, EM_HEXAGON})
.Default({ELFNoneKind, EM_NONE});
}

Expand Down Expand Up @@ -745,7 +746,7 @@ StringMatcher ScriptParser::readFilePatterns() {
SortSectionPolicy ScriptParser::peekSortKind() {
return StringSwitch<SortSectionPolicy>(peek())
.Case("REVERSE", SortSectionPolicy::Reverse)
.Cases("SORT", "SORT_BY_NAME", SortSectionPolicy::Name)
.Cases({"SORT", "SORT_BY_NAME"}, SortSectionPolicy::Name)
.Case("SORT_BY_ALIGNMENT", SortSectionPolicy::Alignment)
.Case("SORT_BY_INIT_PRIORITY", SortSectionPolicy::Priority)
.Case("SORT_NONE", SortSectionPolicy::None)
Expand Down
28 changes: 14 additions & 14 deletions lld/MachO/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,18 +841,18 @@ static PlatformVersion parsePlatformVersion(const Arg *arg) {
// TODO(compnerd) see if we can generate this case list via XMACROS
platformVersion.platform =
StringSwitch<PlatformType>(lowerDash(platformStr))
.Cases("macos", "1", PLATFORM_MACOS)
.Cases("ios", "2", PLATFORM_IOS)
.Cases("tvos", "3", PLATFORM_TVOS)
.Cases("watchos", "4", PLATFORM_WATCHOS)
.Cases("bridgeos", "5", PLATFORM_BRIDGEOS)
.Cases("mac-catalyst", "6", PLATFORM_MACCATALYST)
.Cases("ios-simulator", "7", PLATFORM_IOSSIMULATOR)
.Cases("tvos-simulator", "8", PLATFORM_TVOSSIMULATOR)
.Cases("watchos-simulator", "9", PLATFORM_WATCHOSSIMULATOR)
.Cases("driverkit", "10", PLATFORM_DRIVERKIT)
.Cases("xros", "11", PLATFORM_XROS)
.Cases("xros-simulator", "12", PLATFORM_XROS_SIMULATOR)
.Cases({"macos", "1"}, PLATFORM_MACOS)
.Cases({"ios", "2"}, PLATFORM_IOS)
.Cases({"tvos", "3"}, PLATFORM_TVOS)
.Cases({"watchos", "4"}, PLATFORM_WATCHOS)
.Cases({"bridgeos", "5"}, PLATFORM_BRIDGEOS)
.Cases({"mac-catalyst", "6"}, PLATFORM_MACCATALYST)
.Cases({"ios-simulator", "7"}, PLATFORM_IOSSIMULATOR)
.Cases({"tvos-simulator", "8"}, PLATFORM_TVOSSIMULATOR)
.Cases({"watchos-simulator", "9"}, PLATFORM_WATCHOSSIMULATOR)
.Cases({"driverkit", "10"}, PLATFORM_DRIVERKIT)
.Cases({"xros", "11"}, PLATFORM_XROS)
.Cases({"xros-simulator", "12"}, PLATFORM_XROS_SIMULATOR)
.Default(PLATFORM_UNKNOWN);
if (platformVersion.platform == PLATFORM_UNKNOWN)
error(Twine("malformed platform: ") + platformStr);
Expand Down Expand Up @@ -948,7 +948,7 @@ getUndefinedSymbolTreatment(const ArgList &args) {
StringRef treatmentStr = args.getLastArgValue(OPT_undefined);
auto treatment =
StringSwitch<UndefinedSymbolTreatment>(treatmentStr)
.Cases("error", "", UndefinedSymbolTreatment::error)
.Cases({"error", ""}, UndefinedSymbolTreatment::error)
.Case("warning", UndefinedSymbolTreatment::warning)
.Case("suppress", UndefinedSymbolTreatment::suppress)
.Case("dynamic_lookup", UndefinedSymbolTreatment::dynamic_lookup)
Expand All @@ -972,7 +972,7 @@ getUndefinedSymbolTreatment(const ArgList &args) {
static ICFLevel getICFLevel(const ArgList &args) {
StringRef icfLevelStr = args.getLastArgValue(OPT_icf_eq);
auto icfLevel = StringSwitch<ICFLevel>(icfLevelStr)
.Cases("none", "", ICFLevel::none)
.Cases({"none", ""}, ICFLevel::none)
.Case("safe", ICFLevel::safe)
.Case("safe_thunks", ICFLevel::safe_thunks)
.Case("all", ICFLevel::all)
Expand Down
2 changes: 1 addition & 1 deletion lld/MachO/Sections.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bool isCodeSection(StringRef name, StringRef segName, uint32_t flags) {

if (segName == segment_names::text)
return StringSwitch<bool>(name)
.Cases(section_names::textCoalNt, section_names::staticInit, true)
.Cases({section_names::textCoalNt, section_names::staticInit}, true)
.Default(false);

return false;
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ ConnectionFileDescriptor::Connect(llvm::StringRef path,
llvm::StringSwitch<ConnectionStatus (ConnectionFileDescriptor::*)(
llvm::StringRef, socket_id_callback_type, Status *)>(scheme)
.Case("listen", &ConnectionFileDescriptor::AcceptTCP)
.Cases("accept", "unix-accept",
.Cases({"accept", "unix-accept"},
&ConnectionFileDescriptor::AcceptNamedSocket)
.Case("unix-abstract-accept",
&ConnectionFileDescriptor::AcceptAbstractSocket)
.Cases("connect", "tcp-connect",
.Cases({"connect", "tcp-connect"},
&ConnectionFileDescriptor::ConnectTCP)
.Case("udp", &ConnectionFileDescriptor::ConnectUDP)
.Case("unix-connect", &ConnectionFileDescriptor::ConnectNamedSocket)
Expand Down
6 changes: 3 additions & 3 deletions lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ std::string ABIAArch64::GetMCName(std::string reg) {
uint32_t ABIAArch64::GetGenericNum(llvm::StringRef name) {
return llvm::StringSwitch<uint32_t>(name)
.Case("pc", LLDB_REGNUM_GENERIC_PC)
.Cases("lr", "x30", LLDB_REGNUM_GENERIC_RA)
.Cases("sp", "x31", LLDB_REGNUM_GENERIC_SP)
.Cases("fp", "x29", LLDB_REGNUM_GENERIC_FP)
.Cases({"lr", "x30"}, LLDB_REGNUM_GENERIC_RA)
.Cases({"sp", "x31"}, LLDB_REGNUM_GENERIC_SP)
.Cases({"fp", "x29"}, LLDB_REGNUM_GENERIC_FP)
.Case("cpsr", LLDB_REGNUM_GENERIC_FLAGS)
.Case("x0", LLDB_REGNUM_GENERIC_ARG1)
.Case("x1", LLDB_REGNUM_GENERIC_ARG2)
Expand Down
22 changes: 11 additions & 11 deletions lldb/source/Plugins/ABI/LoongArch/ABISysV_loongarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,17 +622,17 @@ void ABISysV_loongarch::Terminate() {
static uint32_t GetGenericNum(llvm::StringRef name) {
return llvm::StringSwitch<uint32_t>(name)
.Case("pc", LLDB_REGNUM_GENERIC_PC)
.Cases("ra", "r1", LLDB_REGNUM_GENERIC_RA)
.Cases("sp", "r3", LLDB_REGNUM_GENERIC_SP)
.Cases("fp", "r22", LLDB_REGNUM_GENERIC_FP)
.Cases("a0", "r4", LLDB_REGNUM_GENERIC_ARG1)
.Cases("a1", "r5", LLDB_REGNUM_GENERIC_ARG2)
.Cases("a2", "r6", LLDB_REGNUM_GENERIC_ARG3)
.Cases("a3", "r7", LLDB_REGNUM_GENERIC_ARG4)
.Cases("a4", "r8", LLDB_REGNUM_GENERIC_ARG5)
.Cases("a5", "r9", LLDB_REGNUM_GENERIC_ARG6)
.Cases("a6", "r10", LLDB_REGNUM_GENERIC_ARG7)
.Cases("a7", "r11", LLDB_REGNUM_GENERIC_ARG8)
.Cases({"ra", "r1"}, LLDB_REGNUM_GENERIC_RA)
.Cases({"sp", "r3"}, LLDB_REGNUM_GENERIC_SP)
.Cases({"fp", "r22"}, LLDB_REGNUM_GENERIC_FP)
.Cases({"a0", "r4"}, LLDB_REGNUM_GENERIC_ARG1)
.Cases({"a1", "r5"}, LLDB_REGNUM_GENERIC_ARG2)
.Cases({"a2", "r6"}, LLDB_REGNUM_GENERIC_ARG3)
.Cases({"a3", "r7"}, LLDB_REGNUM_GENERIC_ARG4)
.Cases({"a4", "r8"}, LLDB_REGNUM_GENERIC_ARG5)
.Cases({"a5", "r9"}, LLDB_REGNUM_GENERIC_ARG6)
.Cases({"a6", "r10"}, LLDB_REGNUM_GENERIC_ARG7)
.Cases({"a7", "r11"}, LLDB_REGNUM_GENERIC_ARG8)
.Default(LLDB_INVALID_REGNUM);
}

Expand Down
6 changes: 3 additions & 3 deletions lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,9 +815,9 @@ void ABISysV_riscv::Terminate() {
static uint32_t GetGenericNum(llvm::StringRef name) {
return llvm::StringSwitch<uint32_t>(name)
.Case("pc", LLDB_REGNUM_GENERIC_PC)
.Cases("ra", "x1", LLDB_REGNUM_GENERIC_RA)
.Cases("sp", "x2", LLDB_REGNUM_GENERIC_SP)
.Cases("fp", "s0", LLDB_REGNUM_GENERIC_FP)
.Cases({"ra", "x1"}, LLDB_REGNUM_GENERIC_RA)
.Cases({"sp", "x2"}, LLDB_REGNUM_GENERIC_SP)
.Cases({"fp", "s0"}, LLDB_REGNUM_GENERIC_FP)
.Case("a0", LLDB_REGNUM_GENERIC_ARG1)
.Case("a1", LLDB_REGNUM_GENERIC_ARG2)
.Case("a2", LLDB_REGNUM_GENERIC_ARG3)
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Language *ObjCPlusPlusLanguage::CreateInstance(lldb::LanguageType language) {
std::optional<bool>
ObjCPlusPlusLanguage::GetBooleanFromString(llvm::StringRef str) const {
return llvm::StringSwitch<std::optional<bool>>(str)
.Cases("true", "YES", {true})
.Cases("false", "NO", {false})
.Cases({"true", "YES"}, {true})
.Cases({"false", "NO"}, {false})
.Default({});
}
Loading