commit 92e13f2eabebc60644d36283cc40d2433d035b6e
author Simon Pilgrim <llvm-dev@redking.me.uk> Wed Sep 04 12:51:40 2019 +0000
committer Simon Pilgrim <llvm-dev@redking.me.uk> Wed Sep 04 12:51:40 2019 +0000
tree 84035e256edbba641261fe45cc49f9e8fb94d40b
parent e8316372b91e182ba9c7b4bae3bf2ddeff1065cc

Fix "enumeral and non-enumeral type in conditional expression" warnings. NFCI.

llvm-svn: 370892

llvm/tools/llvm-objcopy/CopyConfig.cpp

diff --git a/llvm/tools/llvm-objcopy/CopyConfig.cpp b/llvm/tools/llvm-objcopy/CopyConfig.cpp
index 9591e5a..b3a62a3 100644
--- a/llvm/tools/llvm-objcopy/CopyConfig.cpp
+++ b/llvm/tools/llvm-objcopy/CopyConfig.cpp
@@ -716,7 +716,7 @@
   for (auto Arg : InputArgs.filtered(OBJCOPY_add_symbol)) {
     Expected<NewSymbolInfo> NSI = parseNewSymbolInfo(
         Arg->getValue(),
-        Config.NewSymbolVisibility.getValueOr(ELF::STV_DEFAULT));
+        Config.NewSymbolVisibility.getValueOr((uint8_t)ELF::STV_DEFAULT));
     if (!NSI)
       return NSI.takeError();
     Config.SymbolsToAdd.push_back(*NSI);

llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp

diff --git a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
index fa79b60..bd49426 100644
--- a/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+++ b/llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
@@ -756,7 +756,7 @@
 Error executeObjcopyOnRawBinary(const CopyConfig &Config, MemoryBuffer &In,
                                 Buffer &Out) {
   uint8_t NewSymbolVisibility =
-      Config.NewSymbolVisibility.getValueOr(ELF::STV_DEFAULT);
+      Config.NewSymbolVisibility.getValueOr((uint8_t)ELF::STV_DEFAULT);
   BinaryReader Reader(Config.BinaryArch, &In, NewSymbolVisibility);
   std::unique_ptr<Object> Obj = Reader.create();