<div dir="ltr">We're seeing test failures in lld after this change: <a href="https://logs.chromium.org/logs/fuchsia/buildbucket/cr-buildbucket.appspot.com/8916097779209795744/+/steps/clang/0/steps/test/0/stdout">https://logs.chromium.org/logs/fuchsia/buildbucket/cr-buildbucket.appspot.com/8916097779209795744/+/steps/clang/0/steps/test/0/stdout</a></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Apr 15, 2019 at 8:50 AM Fangrui Song via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: maskray<br>
Date: Mon Apr 15 08:52:32 2019<br>
New Revision: 358418<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=358418&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=358418&view=rev</a><br>
Log:<br>
[llvm-objdump] Simplify PrintHelpMessage() logic<br>
<br>
Modified:<br>
    llvm/trunk/test/tools/llvm-objdump/X86/macho-private-header.test<br>
    llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp<br>
<br>
Modified: llvm/trunk/test/tools/llvm-objdump/X86/macho-private-header.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/macho-private-header.test?rev=358418&r1=358417&r2=358418&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/macho-private-header.test?rev=358418&r1=358417&r2=358418&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-objdump/X86/macho-private-header.test (original)<br>
+++ llvm/trunk/test/tools/llvm-objdump/X86/macho-private-header.test Mon Apr 15 08:52:32 2019<br>
@@ -1,4 +1,4 @@<br>
-// RUN: llvm-objdump -private-header %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s<br>
+// RUN: llvm-objdump -macho -private-header %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s<br>
<br>
 CHECK: Mach header<br>
 CHECK:       magic cputype cpusubtype  caps    filetype ncmds sizeofcmds      flags<br>
<br>
Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=358418&r1=358417&r2=358418&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=358418&r1=358417&r2=358418&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)<br>
+++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Mon Apr 15 08:52:32 2019<br>
@@ -2021,34 +2021,15 @@ int main(int argc, char **argv) {<br>
   if (DisassembleAll || PrintSource || PrintLines)<br>
     Disassemble = true;<br>
<br>
-  if (!Disassemble<br>
-      && !Relocations<br>
-      && !DynamicRelocations<br>
-      && !SectionHeaders<br>
-      && !SectionContents<br>
-      && !SymbolTable<br>
-      && !UnwindInfo<br>
-      && !PrivateHeaders<br>
-      && !FileHeaders<br>
-      && !FirstPrivateHeader<br>
-      && !ExportsTrie<br>
-      && !Rebase<br>
-      && !Bind<br>
-      && !LazyBind<br>
-      && !WeakBind<br>
-      && !RawClangAST<br>
-      && !(UniversalHeaders && MachOOpt)<br>
-      && !ArchiveHeaders<br>
-      && !(IndirectSymbols && MachOOpt)<br>
-      && !(DataInCode && MachOOpt)<br>
-      && !(LinkOptHints && MachOOpt)<br>
-      && !(InfoPlist && MachOOpt)<br>
-      && !(DylibsUsed && MachOOpt)<br>
-      && !(DylibId && MachOOpt)<br>
-      && !(ObjcMetaData && MachOOpt)<br>
-      && !(!FilterSections.empty() && MachOOpt)<br>
-      && !FaultMapSection<br>
-      && DwarfDumpType == DIDT_Null) {<br>
+  if (!ArchiveHeaders && !Disassemble && DwarfDumpType == DIDT_Null &&<br>
+      !DynamicRelocations && !FileHeaders && !PrivateHeaders && !RawClangAST &&<br>
+      !Relocations && !SectionHeaders && !SectionContents && !SymbolTable &&<br>
+      !UnwindInfo && !FaultMapSection &&<br>
+      !(MachOOpt &&<br>
+        (Bind || DataInCode || DylibId || DylibsUsed || ExportsTrie ||<br>
+         FirstPrivateHeader || IndirectSymbols || InfoPlist || LazyBind ||<br>
+         LinkOptHints || Rebase || ObjcMetaData || UniversalHeaders ||<br>
+         WeakBind || !FilterSections.empty()))) {<br>
     cl::PrintHelpMessage();<br>
     return 2;<br>
   }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>