[PATCH] D55040: [llvm-objcopy] Delete redundant !Config.xx.empty() when followed by positive is_contained() check
Fangrui Song via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 29 09:35:58 PST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL347891: [llvm-objcopy] Delete redundant !Config.xx.empty() when followed by positive… (authored by MaskRay, committed by ).
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D55040/new/
https://reviews.llvm.org/D55040
Files:
llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
Index: llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
===================================================================
--- llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
+++ llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
@@ -216,8 +216,7 @@
if (!Sym.isCommon() &&
((Config.LocalizeHidden &&
(Sym.Visibility == STV_HIDDEN || Sym.Visibility == STV_INTERNAL)) ||
- (!Config.SymbolsToLocalize.empty() &&
- is_contained(Config.SymbolsToLocalize, Sym.Name))))
+ is_contained(Config.SymbolsToLocalize, Sym.Name)))
Sym.Binding = STB_LOCAL;
// Note: these two globalize flags have very similar names but different
@@ -235,13 +234,11 @@
Sym.getShndx() != SHN_UNDEF)
Sym.Binding = STB_LOCAL;
- if (!Config.SymbolsToGlobalize.empty() &&
- is_contained(Config.SymbolsToGlobalize, Sym.Name) &&
+ if (is_contained(Config.SymbolsToGlobalize, Sym.Name) &&
Sym.getShndx() != SHN_UNDEF)
Sym.Binding = STB_GLOBAL;
- if (!Config.SymbolsToWeaken.empty() &&
- is_contained(Config.SymbolsToWeaken, Sym.Name) &&
+ if (is_contained(Config.SymbolsToWeaken, Sym.Name) &&
Sym.Binding == STB_GLOBAL)
Sym.Binding = STB_WEAK;
@@ -266,8 +263,7 @@
}
Obj.removeSymbols([&](const Symbol &Sym) {
- if ((!Config.SymbolsToKeep.empty() &&
- is_contained(Config.SymbolsToKeep, Sym.Name)) ||
+ if (is_contained(Config.SymbolsToKeep, Sym.Name) ||
(Config.KeepFileSymbols && Sym.Type == STT_FILE))
return false;
@@ -279,10 +275,8 @@
if (Config.StripAll || Config.StripAllGNU)
return true;
- if (!Config.SymbolsToRemove.empty() &&
- is_contained(Config.SymbolsToRemove, Sym.Name)) {
+ if (is_contained(Config.SymbolsToRemove, Sym.Name))
return true;
- }
if (Config.StripUnneeded && !Sym.Referenced &&
(Sym.Binding == STB_LOCAL || Sym.getShndx() == SHN_UNDEF) &&
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D55040.175888.patch
Type: text/x-patch
Size: 2035 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181129/d269f704/attachment.bin>
More information about the llvm-commits
mailing list