From d2c18b598359f9b59314669ccd15070d07aeb68a Mon Sep 17 00:00:00 2001 From: Jordan Rupprecht Date: Tue, 11 Aug 2020 10:37:19 -0700 Subject: [PATCH] [NFC][llvm-objcopy] Fix redundant config checks. The check for unsupported options checks some configs twice in a || expression. Fixes PR47107. --- llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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");