Revert [llvm-nm] Add tapi file support

This reverts r371576 (git commit f88f46358dbffa20af3b054a9346e5154789d50f)

llvm-svn: 371676

15 files changed, 20 insertions, 298 deletions

diff --git a/llvm/include/llvm/Object/TapiFile.h b/llvm/include/llvm/Object/TapiFile.h
index 45cf5911922..bc2e04e1cc9 100644
--- a/llvm/include/llvm/Object/TapiFile.h
+++ b/llvm/include/llvm/Object/TapiFile.h
@@ -41,8 +41,6 @@ public:
 
   static bool classof(const Binary *v) { return v->isTapiFile(); }
 
-  bool is64Bit() { return MachO::is64Bit(Arch); }
-
 private:
   struct Symbol {
     StringRef Prefix;
@@ -54,7 +52,6 @@ private:
   };
 
   std::vector<Symbol> Symbols;
-  MachO::Architecture Arch;
 };
 
 } // end namespace object.
diff --git a/llvm/include/llvm/TextAPI/MachO/Architecture.def b/llvm/include/llvm/TextAPI/MachO/Architecture.def
index cd5dd6b0920..4c695fe18ee 100644
--- a/llvm/include/llvm/TextAPI/MachO/Architecture.def
+++ b/llvm/include/llvm/TextAPI/MachO/Architecture.def
@@ -13,26 +13,26 @@
 ///
 /// X86 architectures sorted by cpu type and sub type id.
 ///
-ARCHINFO(i386, MachO::CPU_TYPE_I386, MachO::CPU_SUBTYPE_I386_ALL, 32)
-ARCHINFO(x86_64, MachO::CPU_TYPE_X86_64, MachO::CPU_SUBTYPE_X86_64_ALL, 64)
-ARCHINFO(x86_64h, MachO::CPU_TYPE_X86_64, MachO::CPU_SUBTYPE_X86_64_H, 64)
+ARCHINFO(i386, MachO::CPU_TYPE_I386, MachO::CPU_SUBTYPE_I386_ALL)
+ARCHINFO(x86_64, MachO::CPU_TYPE_X86_64, MachO::CPU_SUBTYPE_X86_64_ALL)
+ARCHINFO(x86_64h, MachO::CPU_TYPE_X86_64, MachO::CPU_SUBTYPE_X86_64_H)
 
 
 ///
 /// ARM architectures sorted by cpu sub type id.
 ///
-ARCHINFO(armv4t, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V4T, 32)
-ARCHINFO(armv6, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V6, 32)
-ARCHINFO(armv5, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V5TEJ, 32)
-ARCHINFO(armv7, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7, 32)
-ARCHINFO(armv7s, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7S, 32)
-ARCHINFO(armv7k, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7K, 32)
-ARCHINFO(armv6m, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V6M, 32)
-ARCHINFO(armv7m, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7M, 32)
-ARCHINFO(armv7em, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7EM, 32)
+ARCHINFO(armv4t, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V4T)
+ARCHINFO(armv6, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V6)
+ARCHINFO(armv5, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V5TEJ)
+ARCHINFO(armv7, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7)
+ARCHINFO(armv7s, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7S)
+ARCHINFO(armv7k, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7K)
+ARCHINFO(armv6m, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V6M)
+ARCHINFO(armv7m, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7M)
+ARCHINFO(armv7em, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7EM)
 
 
 ///
 /// ARM64 architectures sorted by cpu sub type id.
 ///
-ARCHINFO(arm64, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64_ALL, 64)
+ARCHINFO(arm64, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64_ALL)
diff --git a/llvm/include/llvm/TextAPI/MachO/Architecture.h b/llvm/include/llvm/TextAPI/MachO/Architecture.h
index c8bce0593fe..055baeb0c0f 100644
--- a/llvm/include/llvm/TextAPI/MachO/Architecture.h
+++ b/llvm/include/llvm/TextAPI/MachO/Architecture.h
@@ -21,7 +21,7 @@ namespace MachO {
 
 /// Defines the architecture slices that are supported by Text-based Stub files.
 enum Architecture : uint8_t {
-#define ARCHINFO(Arch, Type, SubType, NumBits) AK_##Arch,
+#define ARCHINFO(Arch, Type, SubType) AK_##Arch,
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
   AK_unknown, // this has to go last.
@@ -39,9 +39,6 @@ StringRef getArchitectureName(Architecture Arch);
 /// Convert an architecture slice to a CPU Type and Subtype pair.
 std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch);
 
-/// Check if architecture is 64 bit
-bool is64Bit(Architecture);
-
 raw_ostream &operator<<(raw_ostream &OS, Architecture Arch);
 
 } // end namespace MachO.
diff --git a/llvm/lib/Object/TapiFile.cpp b/llvm/lib/Object/TapiFile.cpp
index 1c8fdc0d314..4d9fe7d9e8a 100644
--- a/llvm/lib/Object/TapiFile.cpp
+++ b/llvm/lib/Object/TapiFile.cpp
@@ -40,7 +40,7 @@ static uint32_t getFlags(const Symbol *Sym) {
 
 TapiFile::TapiFile(MemoryBufferRef Source, const InterfaceFile &interface,
                    Architecture Arch)
-    : SymbolicFile(ID_TapiFile, Source), Arch(Arch) {
+    : SymbolicFile(ID_TapiFile, Source) {
   for (const auto *Symbol : interface.symbols()) {
     if (!Symbol->getArchitectures().has(Arch))
       continue;
diff --git a/llvm/lib/TextAPI/MachO/Architecture.cpp b/llvm/lib/TextAPI/MachO/Architecture.cpp
index 4d55c998dac..a66a982fa15 100644
--- a/llvm/lib/TextAPI/MachO/Architecture.cpp
+++ b/llvm/lib/TextAPI/MachO/Architecture.cpp
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/TextAPI/MachO/Architecture.h"
-#include "llvm/TextAPI/MachO/ArchitectureSet.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/BinaryFormat/MachO.h"
 
@@ -19,7 +18,7 @@ namespace llvm {
 namespace MachO {
 
 Architecture getArchitectureFromCpuType(uint32_t CPUType, uint32_t CPUSubType) {
-#define ARCHINFO(Arch, Type, Subtype, NumBits)                                 \
+#define ARCHINFO(Arch, Type, Subtype)                                          \
   if (CPUType == (Type) &&                                                     \
       (CPUSubType & ~MachO::CPU_SUBTYPE_MASK) == (Subtype))                    \
     return AK_##Arch;
@@ -31,7 +30,7 @@ Architecture getArchitectureFromCpuType(uint32_t CPUType, uint32_t CPUSubType) {
 
 Architecture getArchitectureFromName(StringRef Name) {
   return StringSwitch<Architecture>(Name)
-#define ARCHINFO(Arch, Type, Subtype, NumBits) .Case(#Arch, AK_##Arch)
+#define ARCHINFO(Arch, Type, Subtype) .Case(#Arch, AK_##Arch)
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
       .Default(AK_unknown);
@@ -39,7 +38,7 @@ Architecture getArchitectureFromName(StringRef Name) {
 
 StringRef getArchitectureName(Architecture Arch) {
   switch (Arch) {
-#define ARCHINFO(Arch, Type, Subtype, NumBits)                                 \
+#define ARCHINFO(Arch, Type, Subtype)                                          \
   case AK_##Arch:                                                              \
     return #Arch;
 #include "llvm/TextAPI/MachO/Architecture.def"
@@ -55,7 +54,7 @@ StringRef getArchitectureName(Architecture Arch) {
 
 std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch) {
   switch (Arch) {
-#define ARCHINFO(Arch, Type, Subtype, NumBits)                                 \
+#define ARCHINFO(Arch, Type, Subtype)                                          \
   case AK_##Arch:                                                              \
     return std::make_pair(Type, Subtype);
 #include "llvm/TextAPI/MachO/Architecture.def"
@@ -69,22 +68,6 @@ std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch) {
   return std::make_pair(0, 0);
 }
 
-bool is64Bit(Architecture Arch) {
-  switch (Arch) {
-#define ARCHINFO(Arch, Type, Subtype, NumBits)                                 \
-  case AK_##Arch:                                                              \
-    return NumBits == 64;
-#include "llvm/TextAPI/MachO/Architecture.def"
-#undef ARCHINFO
-  case AK_unknown:
-    return false;
-  }
-
-  // Appease some compilers that cannot figure out that this is a fully covered
-  // switch statement.
-  return false;
-}
-
 raw_ostream &operator<<(raw_ostream &OS, Architecture Arch) {
   OS << getArchitectureName(Arch);
   return OS;
diff --git a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp b/llvm/lib/TextAPI/MachO/TextStubCommon.cpp
index be25aefba6a..00382cd2457 100644
--- a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp
+++ b/llvm/lib/TextAPI/MachO/TextStubCommon.cpp
@@ -84,7 +84,7 @@ QuotingType ScalarTraits<PlatformKind>::mustQuote(StringRef) {
 
 void ScalarBitSetTraits<ArchitectureSet>::bitset(IO &IO,
                                                  ArchitectureSet &Archs) {
-#define ARCHINFO(arch, type, subtype, numbits)                                 \
+#define ARCHINFO(arch, type, subtype)                                          \
   IO.bitSetCase(Archs, #arch, 1U << static_cast<int>(AK_##arch));
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
diff --git a/llvm/test/Object/Inputs/tapi-invalid-v1.tbd b/llvm/test/Object/Inputs/tapi-invalid-v1.tbd
deleted file mode 100644
index bc9289c2438..00000000000
--- a/llvm/test/Object/Inputs/tapi-invalid-v1.tbd
+++ /dev/null
@@ -1,21 +0,0 @@
---- !tapi-tbd-v1
-
-archs: [ armv7, armv7s, arm64 ]
-
-platform: ios
-install-name: /u/l/libfoo.dylib
-current-version: 1.2.3
-compatibility-version: 1.0
-swift-version: 0
-objc-constraint: none
-expors:
- - archs: [ arm64, armv7 ]
-   allowed-clients: [ client ]
-   re-exports: [ ]
-   symbols: [ _sym, _test, _a, _b, ]
-   objc-classes: []
-   objc-ivars: []
-
-   weak-def-symbols: []
-   thread-local-symbols: []
-...
diff --git a/llvm/test/Object/Inputs/tapi-invalid-v2.tbd b/llvm/test/Object/Inputs/tapi-invalid-v2.tbd
deleted file mode 100644
index d7e58f372ea..00000000000
--- a/llvm/test/Object/Inputs/tapi-invalid-v2.tbd
+++ /dev/null
@@ -1,29 +0,0 @@
---- !tapi-tbd-v2
-uuids: [ "armv7: 00000000-0000-0000-0000-000000000000",
-         "armv7s: 11111111-1111-1111-1111-111111111111",
-         "arm64: 22222222-2222-2222-2222-222222222222" ]
-platform: ios
-flags: [ installapi ]
-install-name: /u/l/libfoo.dylib
-current-version: 1.2.3
-compatibility-version: 1.0
-swift-version: 0
-objc-constraint: retain_release
-parent-umbrella: Umbrella.dylib
-exports:
-  - archs: [ armv7, armv7s, arm64 ]
-    allowable-clients: [ client ]
-    re-exports: [ ]
-    symbols: [ _sym1, _sym2, _sym3 ]
-    objc-classes: []
-    objc-ivars: []
-
-    weak-def-symbols: []
-    thread-local-symbols: []
-undefineds:
-  - archs: [ arm64 ]
-    symbols: [ _sym ]
-    objc-classes: []
-    objc-ivars: []
-    weak-ref-symbols: []
-...
diff --git a/llvm/test/Object/Inputs/tapi-invalid-v3.tbd b/llvm/test/Object/Inputs/tapi-invalid-v3.tbd
deleted file mode 100644
index fbf615979a9..00000000000
--- a/llvm/test/Object/Inputs/tapi-invalid-v3.tbd
+++ /dev/null
@@ -1,24 +0,0 @@
---- !tapi-tbd-v3
-archs: [ i386, armv7, armv7s ]
-platform: ios
-install-name: /usr/lib/libfoo.dylib
-swift-abi-version: 3
-exports:
-  - archs: [ i386, armv7, armv7s ]
-    re-exports: [ /usr/lib/external/liba.dylib ]
-    symbols: [ _sym1, _sym2 ]
-    objc-classes: [ NSString, NSBlockPredicate ]
-    objc-eh-types: [ NSString ]
-    objc-ivars: [ NSBlockPredicate._block ]
-  - archs: [ i386 ]
-    symbols: [ _sym3 ]
---- !tapi-tbd-v3
-archs: [ armv7, armv7s ]
-platform: ios
-install-name: /usr/lib/liba.dylib
-swift-version: 3
-exports:
-  - archs: [ armv7, armv7s ]
-    re-exports: [ /usr/lib/internal/liba.dylib ]
-    symbols: [ _sym10, _sym11 ]
-...
diff --git a/llvm/test/Object/Inputs/tapi-v1.tbd b/llvm/test/Object/Inputs/tapi-v1.tbd
deleted file mode 100644
index 91a3571ec82..00000000000
--- a/llvm/test/Object/Inputs/tapi-v1.tbd
+++ /dev/null
@@ -1,21 +0,0 @@
---- !tapi-tbd-v1
-
-archs: [ armv7, armv7s ]
-
-platform: ios
-install-name: /u/l/libfoo.dylib
-current-version: 1.2.3
-compatibility-version: 1.0
-swift-version: 0
-objc-constraint: none
-exports:
- - archs: [ armv7 ]
-   allowed-clients: [ client ]
-   re-exports: [ ]
-   symbols: [ _sym, ]
-   objc-classes: []
-   objc-ivars: []
-
-   weak-def-symbols: []
-   thread-local-symbols: [_sym]
-...
diff --git a/llvm/test/Object/Inputs/tapi-v2.tbd b/llvm/test/Object/Inputs/tapi-v2.tbd
deleted file mode 100644
index 7ba9a12600d..00000000000
--- a/llvm/test/Object/Inputs/tapi-v2.tbd
+++ /dev/null
@@ -1,30 +0,0 @@
---- !tapi-tbd-v2
-archs: [ armv7, armv7s, arm64 ]
-uuids: [ "armv7: 00000000-0000-0000-0000-000000000000",
-         "armv7s: 11111111-1111-1111-1111-111111111111",
-         "arm64: 22222222-2222-2222-2222-222222222222" ]
-platform: ios
-flags: [ installapi ]
-install-name: /u/l/libfoo.dylib
-current-version: 1.2.3
-compatibility-version: 1.0
-swift-version: 0
-objc-constraint: retain_release
-parent-umbrella: Umbrella.dylib
-exports:
-  - archs: [ armv7, armv7s, arm64 ]
-    allowable-clients: [ client ]
-    re-exports: [ ]
-    symbols: [ _sym1, _sym2, _sym3 ]
-    objc-classes: []
-    objc-ivars: []
-
-    weak-def-symbols: []
-    thread-local-symbols: []
-undefineds:
-  - archs: [ arm64 ]
-    symbols: [ _sym ]
-    objc-classes: []
-    objc-ivars: []
-    weak-ref-symbols: []
-...
diff --git a/llvm/test/Object/Inputs/tapi-v3.tbd b/llvm/test/Object/Inputs/tapi-v3.tbd
deleted file mode 100644
index 1d08024543b..00000000000
--- a/llvm/test/Object/Inputs/tapi-v3.tbd
+++ /dev/null
@@ -1,24 +0,0 @@
---- !tapi-tbd-v3
-archs: [ i386, armv7, armv7s ]
-platform: ios
-install-name: /usr/lib/libfoo.dylib
-swift-abi-version: 3
-exports:
-  - archs: [ i386, armv7, armv7s ]
-    re-exports: [ /usr/lib/external/liba.dylib ]
-    symbols: [ _sym1, _sym2 ]
-    objc-classes: [ NSString, NSBlockPredicate ]
-    objc-eh-types: [ NSString ]
-    objc-ivars: [ NSBlockPredicate._block ]
-  - archs: [ i386 ]
-    symbols: [ _sym3 ]
---- !tapi-tbd-v3
-archs: [ armv7, armv7s ]
-platform: ios
-install-name: /usr/lib/liba.dylib
-swift-abi-version: 3
-exports:
-  - archs: [ armv7, armv7s ]
-    re-exports: [ /usr/lib/internal/liba.dylib ]
-    symbols: [ _sym10, _sym11 ]
-...
diff --git a/llvm/test/Object/nm-tapi-invalids.test b/llvm/test/Object/nm-tapi-invalids.test
deleted file mode 100644
index c9199f89c6c..00000000000
--- a/llvm/test/Object/nm-tapi-invalids.test
+++ /dev/null
@@ -1,20 +0,0 @@
-RUN: not llvm-nm %p/Inputs/tapi-invalid-v1.tbd 2>&1\
-RUN:          | Filecheck %s -check-prefix v1
-
-RUN: not llvm-nm %p/Inputs/tapi-invalid-v2.tbd 2>&1\
-RUN:          | Filecheck %s -check-prefix v2
-
-RUN: not llvm-nm %p/Inputs/tapi-invalid-v3.tbd 2>&1\
-RUN:          | Filecheck %s -check-prefix v3
-
-# Typo Check
-v1: tapi-invalid-v1.tbd malformed file
-v1: tapi-invalid-v1.tbd:12:2: error: unknown key 'expors'
-
-# Missing required key
-v2: tapi-invalid-v2.tbd malformed file
-v2: tapi-invalid-v2.tbd:2:1: error: missing required key 'archs'
-
-# v2 key in v3 specified file
-v3: tapi-invalid-v3.tbd malformed file
-v3: tapi-invalid-v3.tbd:19:16: error: unknown key 'swift-version'
diff --git a/llvm/test/Object/nm-tapi.test b/llvm/test/Object/nm-tapi.test
deleted file mode 100644
index 069fffb5c9d..00000000000
--- a/llvm/test/Object/nm-tapi.test
+++ /dev/null
@@ -1,56 +0,0 @@
-RUN: llvm-nm %p/Inputs/tapi-v1.tbd 2>&1\
-RUN:          | Filecheck %s -check-prefix v1
-
-RUN: llvm-nm %p/Inputs/tapi-v2.tbd \
-RUN:          | Filecheck %s -check-prefix v2
-
-RUN: llvm-nm %p/Inputs/tapi-v3.tbd \
-RUN:          | Filecheck %s -check-prefix v3
-
-v1: no symbols
-v1: tapi-v1.tbd (for architecture armv7):
-v1: 00000000 S _sym
-v1: tapi-v1.tbd (for architecture armv7s):
-
-v2: tapi-v2.tbd (for architecture armv7):
-v2: 00000000 S _sym1
-v2: 00000000 S _sym2
-v2: 00000000 S _sym3
-v2: tapi-v2.tbd (for architecture armv7s):
-v2: 00000000 S _sym1
-v2: 00000000 S _sym2
-v2: 00000000 S _sym3
-v2: tapi-v2.tbd (for architecture arm64):
-v2:          U _sym
-v2: 0000000000000000 S _sym1
-v2: 0000000000000000 S _sym2
-v2: 0000000000000000 S _sym3
-
-v3: tapi-v3.tbd (for architecture i386):
-v3: 00000000 S _OBJC_CLASS_$_NSBlockPredicate
-v3: 00000000 S _OBJC_CLASS_$_NSString
-v3: 00000000 S _OBJC_EHTYPE_$_NSString
-v3: 00000000 S _OBJC_IVAR_$_NSBlockPredicate._block
-v3: 00000000 S _OBJC_METACLASS_$_NSBlockPredicate
-v3: 00000000 S _OBJC_METACLASS_$_NSString
-v3: 00000000 S _sym1
-v3: 00000000 S _sym2
-v3: 00000000 S _sym3
-v3: tapi-v3.tbd (for architecture armv7):
-v3: 00000000 S _OBJC_CLASS_$_NSBlockPredicate
-v3: 00000000 S _OBJC_CLASS_$_NSString
-v3: 00000000 S _OBJC_EHTYPE_$_NSString
-v3: 00000000 S _OBJC_IVAR_$_NSBlockPredicate._block
-v3: 00000000 S _OBJC_METACLASS_$_NSBlockPredicate
-v3: 00000000 S _OBJC_METACLASS_$_NSString
-v3: 00000000 S _sym1
-v3: 00000000 S _sym2
-v3: tapi-v3.tbd (for architecture armv7s):
-v3: 00000000 S _OBJC_CLASS_$_NSBlockPredicate
-v3: 00000000 S _OBJC_CLASS_$_NSString
-v3: 00000000 S _OBJC_EHTYPE_$_NSString
-v3: 00000000 S _OBJC_IVAR_$_NSBlockPredicate._block
-v3: 00000000 S _OBJC_METACLASS_$_NSBlockPredicate
-v3: 00000000 S _OBJC_METACLASS_$_NSString
-v3: 00000000 S _sym1
-v3: 00000000 S _sym2
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index fafefb6084b..ee55722dc13 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -28,8 +28,6 @@
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/MachOUniversal.h"
 #include "llvm/Object/ObjectFile.h"
-#include "llvm/Object/TapiFile.h"
-#include "llvm/Object/TapiUniversal.h"
 #include "llvm/Object/Wasm.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
@@ -338,8 +336,6 @@ static char isSymbolList64Bit(SymbolicFile &Obj) {
     return false;
   if (isa<WasmObjectFile>(Obj))
     return false;
-  if (TapiFile *Tapi = dyn_cast<TapiFile>(&Obj))
-    return Tapi->is64Bit();
   if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj))
     return MachO->is64Bit();
   return cast<ELFObjectFileBase>(Obj).getBytesInAddress() == 8;
@@ -1045,10 +1041,6 @@ static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) {
   return '?';
 }
 
-static char getSymbolNMTypeChar(TapiFile &Obj, basic_symbol_iterator I) {
-  return 's';
-}
-
 static char getSymbolNMTypeChar(WasmObjectFile &Obj, basic_symbol_iterator I) {
   uint32_t Flags = I->getFlags();
   if (Flags & SymbolRef::SF_Executable)
@@ -1141,8 +1133,6 @@ static char getNMSectionTagAndName(SymbolicFile &Obj, basic_symbol_iterator I,
     Ret = getSymbolNMTypeChar(*MachO, I);
   else if (WasmObjectFile *Wasm = dyn_cast<WasmObjectFile>(&Obj))
     Ret = getSymbolNMTypeChar(*Wasm, I);
-  else if (TapiFile *Tapi = dyn_cast<TapiFile>(&Obj))
-    Ret = getSymbolNMTypeChar(*Tapi, I);
   else
     Ret = getSymbolNMTypeChar(cast<ELFObjectFileBase>(Obj), I);
 
@@ -2073,26 +2063,6 @@ static void dumpSymbolNamesFromFile(std::string &Filename) {
     }
     return;
   }
-
-  if (TapiUniversal *TU = dyn_cast<TapiUniversal>(&Bin)) {
-    for (auto &I : TU->objects()) {
-      auto ObjOrErr = I.getAsObjectFile();
-      if (ObjOrErr) {
-        auto &Obj = *ObjOrErr.get();
-        outs() << "\n"
-               << Obj.getFileName() << " (for architecture "
-               << I.getArchFlagName() << ")"
-               << ":\n";
-        dumpSymbolNamesFromObject(Obj, false, {}, I.getArchFlagName());
-      } else if (auto E =
-                     isNotObjectErrorInvalidFileType(ObjOrErr.takeError())) {
-        error(std::move(E), Filename, I.getArchFlagName());
-      }
-    }
-
-    return;
-  }
-
   if (SymbolicFile *O = dyn_cast<SymbolicFile>(&Bin)) {
     if (!MachOPrintSizeWarning && PrintSize &&  isa<MachOObjectFile>(O)) {
       WithColor::warning(errs(), ToolName)