From e3b557809604d036af6e00c60f012c2025b59a5e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 11 Feb 2023 13:38:04 +0100 Subject: Vendor import of llvm-project main llvmorg-16-init-18548-gb0daacf58f41, the last commit before the upstream release/17.x branch was created. --- llvm/utils/TableGen/X86DisassemblerTables.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'llvm/utils/TableGen/X86DisassemblerTables.cpp') diff --git a/llvm/utils/TableGen/X86DisassemblerTables.cpp b/llvm/utils/TableGen/X86DisassemblerTables.cpp index 2fa8fce81422..601591d9f53d 100644 --- a/llvm/utils/TableGen/X86DisassemblerTables.cpp +++ b/llvm/utils/TableGen/X86DisassemblerTables.cpp @@ -16,7 +16,6 @@ #include "X86DisassemblerTables.h" #include "X86DisassemblerShared.h" #include "X86ModRMFilters.h" -#include "llvm/ADT/STLArrayExtras.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Format.h" @@ -653,7 +652,7 @@ static const char* stringForDecisionType(ModRMDecisionType dt) { } DisassemblerTables::DisassemblerTables() { - for (unsigned i = 0; i < llvm::array_lengthof(Tables); i++) + for (unsigned i = 0; i < std::size(Tables); i++) Tables[i] = std::make_unique(); HasConflicts = false; @@ -763,7 +762,7 @@ void DisassemblerTables::emitOpcodeDecision(raw_ostream &o1, raw_ostream &o2, } if (index == 256) { // If all 256 entries are MODRM_ONEENTRY, omit output. - static_assert(MODRM_ONEENTRY == 0, ""); + static_assert(MODRM_ONEENTRY == 0); --i2; o2 << "},\n"; } else { -- cgit v1.2.3