Skip to content

Commit c1796be

Browse files
committed
Don't rely in llvm::Bitset CTAD. NFC.
This triggers a lot of -Wctad-maybe-unsupported
1 parent 06bb6c8 commit c1796be

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

clang/lib/Basic/Targets/AArch64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ bool AArch64TargetInfo::initFeatureMap(
979979
// Parse the CPU and add any implied features.
980980
std::optional<llvm::AArch64::CpuInfo> CpuInfo = llvm::AArch64::parseCpu(CPU);
981981
if (CpuInfo) {
982-
llvm::Bitset Exts = CpuInfo->getImpliedExtensions();
982+
auto Exts = CpuInfo->getImpliedExtensions();
983983
std::vector<StringRef> CPUFeats;
984984
llvm::AArch64::getExtensionFeatures(Exts, CPUFeats);
985985
for (auto F : CPUFeats) {

clang/lib/Driver/ToolChains/Arch/AArch64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ static bool DecodeAArch64Mcpu(const Driver &D, StringRef Mcpu, StringRef &CPU,
158158

159159
Features.push_back(ArchInfo->ArchFeature);
160160

161-
llvm::Bitset Extension = CpuInfo->getImpliedExtensions();
161+
auto Extension = CpuInfo->getImpliedExtensions();
162162
if (!llvm::AArch64::getExtensionFeatures(Extension, Features))
163163
return false;
164164
}

llvm/include/llvm/TargetParser/AArch64TargetParser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ inline constexpr ArchInfo ARMV9_3A = { VersionTuple{9, 3}, AProfile, "armv9.3-a
347347
inline constexpr ArchInfo ARMV9_4A = { VersionTuple{9, 4}, AProfile, "armv9.4-a", "+v9.4a", (ARMV9_3A.DefaultExts |
348348
AArch64::ExtensionBitset({AArch64::AEK_SPECRES2, AArch64::AEK_CSSC, AArch64::AEK_RASv2}))};
349349
// For v8-R, we do not enable crypto and align with GCC that enables a more minimal set of optional architecture extensions.
350-
inline constexpr ArchInfo ARMV8R = { VersionTuple{8, 0}, RProfile, "armv8-r", "+v8r", (Bitset(ARMV8_5A.DefaultExts) |
350+
inline constexpr ArchInfo ARMV8R = { VersionTuple{8, 0}, RProfile, "armv8-r", "+v8r", (ARMV8_5A.DefaultExts |
351351
AArch64::ExtensionBitset({AArch64::AEK_SSBS,
352352
AArch64::AEK_FP16, AArch64::AEK_FP16FML, AArch64::AEK_SB}).flip(AArch64::AEK_LSE))};
353353
// clang-format on

llvm/unittests/TargetParser/TargetParserTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ INSTANTIATE_TEST_SUITE_P(
216216
ARMCPUTestParams<uint64_t>("arm1020t", "armv5t", "none", ARM::AEK_NONE, "5T"),
217217
ARMCPUTestParams<uint64_t>("arm9e", "armv5te", "none",
218218
ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
219-
ARMCPUTestParams("arm946e-s", "armv5te", "none",
219+
ARMCPUTestParams<uint64_t>("arm946e-s", "armv5te", "none",
220220
ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
221221
ARMCPUTestParams<uint64_t>("arm966e-s", "armv5te", "none",
222222
ARM::AEK_NONE | ARM::AEK_DSP, "5TE"),
@@ -1015,7 +1015,7 @@ class AArch64CPUTestFixture
10151015
ARMCPUTestParams<AArch64::ExtensionBitset>> {};
10161016

10171017
TEST_P(AArch64CPUTestFixture, testAArch64CPU) {
1018-
ARMCPUTestParams params = GetParam();
1018+
auto params = GetParam();
10191019

10201020
const std::optional<AArch64::CpuInfo> Cpu = AArch64::parseCpu(params.CPUName);
10211021
EXPECT_TRUE(Cpu);

0 commit comments

Comments
 (0)