Skip to content

Commit e8b5fbd

Browse files
[AMDGPU, RISCV] Fix warnings
This patch fixes: llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.cpp:451:13: error: explicit specialization cannot have a storage class [-Werror,-Wexplicit-specialization-storage-class] llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.cpp:452:13: error: explicit specialization cannot have a storage class [-Werror,-Wexplicit-specialization-storage-class] llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.cpp:454:1: error: explicit specialization cannot have a storage class [-Werror,-Wexplicit-specialization-storage-class] llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.cpp:456:1: error: explicit specialization cannot have a storage class [-Werror,-Wexplicit-specialization-storage-class] While I am at it, this patch changes the storage types of InsnBitWidth specilization to "inline constexpr" to avoid linker errors.
1 parent a7d1a65 commit e8b5fbd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

llvm/lib/Target/AMDGPU/Disassembler/AMDGPUDisassembler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,12 @@ static DecodeStatus decodeVersionImm(MCInst &Inst, unsigned Imm,
448448
#include "AMDGPUGenDisassemblerTables.inc"
449449

450450
// Define bitwidths for various types used to instantiate the decoder.
451-
template <> static constexpr uint32_t llvm::MCD::InsnBitWidth<uint32_t> = 32;
452-
template <> static constexpr uint32_t llvm::MCD::InsnBitWidth<uint64_t> = 64;
451+
template <> inline constexpr uint32_t llvm::MCD::InsnBitWidth<uint32_t> = 32;
452+
template <> inline constexpr uint32_t llvm::MCD::InsnBitWidth<uint64_t> = 64;
453453
template <>
454-
static constexpr uint32_t llvm::MCD::InsnBitWidth<std::bitset<96>> = 96;
454+
inline constexpr uint32_t llvm::MCD::InsnBitWidth<std::bitset<96>> = 96;
455455
template <>
456-
static constexpr uint32_t llvm::MCD::InsnBitWidth<std::bitset<128>> = 128;
456+
inline constexpr uint32_t llvm::MCD::InsnBitWidth<std::bitset<128>> = 128;
457457

458458
//===----------------------------------------------------------------------===//
459459
//

llvm/lib/Target/RISCV/Disassembler/RISCVDisassembler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -702,10 +702,10 @@ static constexpr DecoderListEntry DecoderList32[]{
702702
};
703703

704704
// Define bitwidths for various types used to instantiate the decoder.
705-
template <> constexpr uint32_t llvm::MCD::InsnBitWidth<uint16_t> = 16;
706-
template <> constexpr uint32_t llvm::MCD::InsnBitWidth<uint32_t> = 32;
705+
template <> inline constexpr uint32_t llvm::MCD::InsnBitWidth<uint16_t> = 16;
706+
template <> inline constexpr uint32_t llvm::MCD::InsnBitWidth<uint32_t> = 32;
707707
// Use uint64_t to represent 48 bit instructions.
708-
template <> constexpr uint32_t llvm::MCD::InsnBitWidth<uint64_t> = 48;
708+
template <> inline constexpr uint32_t llvm::MCD::InsnBitWidth<uint64_t> = 48;
709709

710710
DecodeStatus RISCVDisassembler::getInstruction32(MCInst &MI, uint64_t &Size,
711711
ArrayRef<uint8_t> Bytes,

0 commit comments

Comments
 (0)