[llvm] r357706 - llvm-dwarfdump: Support alternative architecture names in the -arch filter

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Thu Apr  4 08:48:40 2019
New Revision: 357706

URL: http://llvm.org/viewvc/llvm-project?rev=357706&view=rev
Log:
llvm-dwarfdump: Support alternative architecture names in the -arch filter

<rdar://problem/47918606>

Added:
    llvm/trunk/test/tools/llvm-dwarfdump/AArch64/arch.ll
    llvm/trunk/test/tools/llvm-dwarfdump/AArch64/lit.local.cfg
Modified:
    llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp

Added: llvm/trunk/test/tools/llvm-dwarfdump/AArch64/arch.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/AArch64/arch.ll?rev=357706&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/AArch64/arch.ll (added)
+++ llvm/trunk/test/tools/llvm-dwarfdump/AArch64/arch.ll Thu Apr  4 08:48:40 2019
@@ -0,0 +1,24 @@
+; RUN: llc -O0 %s -filetype=obj -o %t.o
+; RUN: llvm-dwarfdump -arch arm64   %t.o | FileCheck %s
+; RUN: llvm-dwarfdump -arch aarch64 %t.o | FileCheck %s
+; RUN: llvm-dwarfdump -arch 0x0100000c %t.o | FileCheck %s
+; CHECK: file format Mach-O arm64
+;
+; RUN: llvm-dwarfdump -arch i386 %t.o \
+; RUN:    | FileCheck %s --allow-empty --check-prefix=NEGATIVE
+; RUN: llvm-dwarfdump -arch 0 %t.o \
+; RUN:    | FileCheck %s --allow-empty --check-prefix=NEGATIVE
+; NEGATIVE-NOT: file format
+source_filename = "/tmp/empty.c"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-ios"
+
+!llvm.module.flags = !{!1, !2, !3, !4}
+!llvm.dbg.cu = !{!5}
+
+!1 = !{i32 2, !"Dwarf Version", i32 4}
+!2 = !{i32 2, !"Debug Info Version", i32 3}
+!3 = !{i32 1, !"wchar_size", i32 4}
+!4 = !{i32 7, !"PIC Level", i32 2}
+!5 = distinct !DICompileUnit(language: DW_LANG_C99, file: !6, producer: "Apple clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
+!6 = !DIFile(filename: "/tmp/empty.c", directory: "/Volumes/Data/llvm-project")

Added: llvm/trunk/test/tools/llvm-dwarfdump/AArch64/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwarfdump/AArch64/lit.local.cfg?rev=357706&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-dwarfdump/AArch64/lit.local.cfg (added)
+++ llvm/trunk/test/tools/llvm-dwarfdump/AArch64/lit.local.cfg Thu Apr  4 08:48:40 2019
@@ -0,0 +1,2 @@
+if not 'AArch64' in config.root.targets:
+    config.unsupported = True

Modified: llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp?rev=357706&r1=357705&r2=357706&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp (original)
+++ llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp Thu Apr  4 08:48:40 2019
@@ -258,19 +258,16 @@ static bool filterArch(ObjectFile &Obj)
     return true;
 
   if (auto *MachO = dyn_cast<MachOObjectFile>(&Obj)) {
-    std::string ObjArch =
-        Triple::getArchTypeName(MachO->getArchTriple().getArch());
-
     for (auto Arch : ArchFilters) {
-      // Match name.
-      if (Arch == ObjArch)
-        return true;
-
       // Match architecture number.
       unsigned Value;
       if (!StringRef(Arch).getAsInteger(0, Value))
         if (Value == getCPUType(*MachO))
           return true;
+
+      // Match as name.
+      if (MachO->getArchTriple().getArch() == Triple(Arch).getArch())
+        return true;
     }
   }
   return false;