[llvm] ea548a4 - [MC][ELF] Fix "enumeral and non-enumeral type in conditional expression" warning (NFC)

Yang Fan via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 9 19:27:27 PST 2021


Author: Yang Fan
Date: 2021-03-10T11:27:15+08:00
New Revision: ea548a4e413812d4726f158f9de5604739ed8a51

URL: https://github.com/llvm/llvm-project/commit/ea548a4e413812d4726f158f9de5604739ed8a51
DIFF: https://github.com/llvm/llvm-project/commit/ea548a4e413812d4726f158f9de5604739ed8a51.diff

LOG: [MC][ELF] Fix "enumeral and non-enumeral type in conditional expression" warning (NFC)

GCC warning:
```
/llvm-project/llvm/lib/MC/ELFObjectWriter.cpp: In member function ‘void {anonymous}::ELFWriter::writeHeader(const llvm::MCAssembler&)’:
/llvm-project/llvm/lib/MC/ELFObjectWriter.cpp:421:20: warning: enumeral and non-enumeral type in conditional expression [-Wextra]
  420 |   W.OS << char(OSABI == ELF::ELFOSABI_NONE && OWriter.seenGnuAbi()
      |                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  421 |                    ? ELF::ELFOSABI_GNU
      |                    ^~~~~~~~~~~~~~~~~~~
  422 |                    : OSABI);
      |                    ~~~~~~~
```

Added: 
    

Modified: 
    llvm/lib/MC/ELFObjectWriter.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index b837e6e53305..dd36aec112e5 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -418,7 +418,7 @@ void ELFWriter::writeHeader(const MCAssembler &Asm) {
   // e_ident[EI_OSABI]
   uint8_t OSABI = OWriter.TargetObjectWriter->getOSABI();
   W.OS << char(OSABI == ELF::ELFOSABI_NONE && OWriter.seenGnuAbi()
-                   ? ELF::ELFOSABI_GNU
+                   ? int(ELF::ELFOSABI_GNU)
                    : OSABI);
   // e_ident[EI_ABIVERSION]
   W.OS << char(OWriter.TargetObjectWriter->getABIVersion());


        


More information about the llvm-commits mailing list