[llvm] d2c18b5 - [NFC][llvm-objcopy] Fix redundant config checks.

[Jordan Rupprecht via llvm-commits]

Author: Jordan Rupprecht
Date: 2020-08-11T10:37:19-07:00
New Revision: d2c18b598359f9b59314669ccd15070d07aeb68a

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

LOG: [NFC][llvm-objcopy] Fix redundant config checks.

The check for unsupported options checks some configs twice in a || expression. Fixes PR47107.

Added: 
    

Modified: 
    llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp b/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
index 5ca5b133572b..68cbdbbf6be8 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
@@ -311,8 +311,7 @@ static Error handleArgs(const CopyConfig &Config, Object &Obj) {
       Config.ExtractDWO || Config.LocalizeHidden || Config.PreserveDates ||
       Config.StripAllGNU || Config.StripDWO || Config.StripNonAlloc ||
       Config.StripSections || Config.Weaken || Config.DecompressDebugSections ||
-      Config.StripNonAlloc || Config.StripSections || Config.StripUnneeded ||
-      Config.DiscardMode == DiscardType::Locals ||
+      Config.StripUnneeded || Config.DiscardMode == DiscardType::Locals ||
       !Config.SymbolsToAdd.empty() || Config.EntryExpr) {
     return createStringError(llvm::errc::invalid_argument,
                              "option not supported by llvm-objcopy for MachO");