Skip to content

Commit b68bf98

Browse files
committed
[llvm-readobj] Delete redundant 'static' from namespace scope 'static const'. NFC
By default, such a non-template variable of non-volatile const-qualified type having namespace-scope has internal linkage ([basic.link]), so no need for `static`.
1 parent cc3115c commit b68bf98

7 files changed

+85
-85
lines changed

llvm/tools/llvm-readobj/COFFDumper.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void COFFDumper::printBinaryBlockWithRelocs(StringRef Label,
337337
}
338338
}
339339

340-
static const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = {
340+
const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = {
341341
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_UNKNOWN ),
342342
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AM33 ),
343343
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AMD64 ),
@@ -362,7 +362,7 @@ static const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = {
362362
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_WCEMIPSV2)
363363
};
364364

365-
static const EnumEntry<COFF::Characteristics> ImageFileCharacteristics[] = {
365+
const EnumEntry<COFF::Characteristics> ImageFileCharacteristics[] = {
366366
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_RELOCS_STRIPPED ),
367367
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_EXECUTABLE_IMAGE ),
368368
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_LINE_NUMS_STRIPPED ),
@@ -380,7 +380,7 @@ static const EnumEntry<COFF::Characteristics> ImageFileCharacteristics[] = {
380380
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_BYTES_REVERSED_HI )
381381
};
382382

383-
static const EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = {
383+
const EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = {
384384
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_UNKNOWN ),
385385
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_NATIVE ),
386386
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_WINDOWS_GUI ),
@@ -394,7 +394,7 @@ static const EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = {
394394
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_XBOX ),
395395
};
396396

397-
static const EnumEntry<COFF::DLLCharacteristics> PEDLLCharacteristics[] = {
397+
const EnumEntry<COFF::DLLCharacteristics> PEDLLCharacteristics[] = {
398398
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA ),
399399
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE ),
400400
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY ),
@@ -453,7 +453,7 @@ ImageSectionCharacteristics[] = {
453453
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SCN_MEM_WRITE )
454454
};
455455

456-
static const EnumEntry<COFF::SymbolBaseType> ImageSymType[] = {
456+
const EnumEntry<COFF::SymbolBaseType> ImageSymType[] = {
457457
{ "Null" , COFF::IMAGE_SYM_TYPE_NULL },
458458
{ "Void" , COFF::IMAGE_SYM_TYPE_VOID },
459459
{ "Char" , COFF::IMAGE_SYM_TYPE_CHAR },
@@ -472,14 +472,14 @@ static const EnumEntry<COFF::SymbolBaseType> ImageSymType[] = {
472472
{ "DWord" , COFF::IMAGE_SYM_TYPE_DWORD }
473473
};
474474

475-
static const EnumEntry<COFF::SymbolComplexType> ImageSymDType[] = {
475+
const EnumEntry<COFF::SymbolComplexType> ImageSymDType[] = {
476476
{ "Null" , COFF::IMAGE_SYM_DTYPE_NULL },
477477
{ "Pointer" , COFF::IMAGE_SYM_DTYPE_POINTER },
478478
{ "Function", COFF::IMAGE_SYM_DTYPE_FUNCTION },
479479
{ "Array" , COFF::IMAGE_SYM_DTYPE_ARRAY }
480480
};
481481

482-
static const EnumEntry<COFF::SymbolStorageClass> ImageSymClass[] = {
482+
const EnumEntry<COFF::SymbolStorageClass> ImageSymClass[] = {
483483
{ "EndOfFunction" , COFF::IMAGE_SYM_CLASS_END_OF_FUNCTION },
484484
{ "Null" , COFF::IMAGE_SYM_CLASS_NULL },
485485
{ "Automatic" , COFF::IMAGE_SYM_CLASS_AUTOMATIC },
@@ -509,7 +509,7 @@ static const EnumEntry<COFF::SymbolStorageClass> ImageSymClass[] = {
509509
{ "CLRToken" , COFF::IMAGE_SYM_CLASS_CLR_TOKEN }
510510
};
511511

512-
static const EnumEntry<COFF::COMDATType> ImageCOMDATSelect[] = {
512+
const EnumEntry<COFF::COMDATType> ImageCOMDATSelect[] = {
513513
{ "NoDuplicates", COFF::IMAGE_COMDAT_SELECT_NODUPLICATES },
514514
{ "Any" , COFF::IMAGE_COMDAT_SELECT_ANY },
515515
{ "SameSize" , COFF::IMAGE_COMDAT_SELECT_SAME_SIZE },
@@ -519,7 +519,7 @@ static const EnumEntry<COFF::COMDATType> ImageCOMDATSelect[] = {
519519
{ "Newest" , COFF::IMAGE_COMDAT_SELECT_NEWEST }
520520
};
521521

522-
static const EnumEntry<COFF::DebugType> ImageDebugType[] = {
522+
const EnumEntry<COFF::DebugType> ImageDebugType[] = {
523523
{"Unknown", COFF::IMAGE_DEBUG_TYPE_UNKNOWN},
524524
{"COFF", COFF::IMAGE_DEBUG_TYPE_COFF},
525525
{"CodeView", COFF::IMAGE_DEBUG_TYPE_CODEVIEW},
@@ -548,7 +548,7 @@ WeakExternalCharacteristics[] = {
548548
{ "Alias" , COFF::IMAGE_WEAK_EXTERN_SEARCH_ALIAS }
549549
};
550550

551-
static const EnumEntry<uint32_t> SubSectionTypes[] = {
551+
const EnumEntry<uint32_t> SubSectionTypes[] = {
552552
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, Symbols),
553553
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, Lines),
554554
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, StringTable),
@@ -564,13 +564,13 @@ static const EnumEntry<uint32_t> SubSectionTypes[] = {
564564
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, CoffSymbolRVA),
565565
};
566566

567-
static const EnumEntry<uint32_t> FrameDataFlags[] = {
567+
const EnumEntry<uint32_t> FrameDataFlags[] = {
568568
LLVM_READOBJ_ENUM_ENT(FrameData, HasSEH),
569569
LLVM_READOBJ_ENUM_ENT(FrameData, HasEH),
570570
LLVM_READOBJ_ENUM_ENT(FrameData, IsFunctionStart),
571571
};
572572

573-
static const EnumEntry<uint8_t> FileChecksumKindNames[] = {
573+
const EnumEntry<uint8_t> FileChecksumKindNames[] = {
574574
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, None),
575575
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, MD5),
576576
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, SHA1),

0 commit comments

Comments
 (0)