Revert "Reland "[llvm] llvm-tapi-diff""

This reverts commit 20126c9.
The sorting fixes failed to have stable output on different platforms.

Author: cyndyishida

llvm/include/llvm/Object/TapiUniversal.h

@@ -101,8 +101,6 @@ class TapiUniversal : public Binary {
     return make_range(begin_objects(), end_objects());
   }
 
-  const MachO::InterfaceFile &getInterfaceFile() { return *ParsedFile; }
-
   uint32_t getNumberOfObjects() const { return Libraries.size(); }
 
   static bool classof(const Binary *v) { return v->isTapiUniversal(); }

llvm/include/llvm/TextAPI/Platform.h

@@ -40,8 +40,6 @@ PlatformKind mapToPlatformKind(const Triple &Target);
 PlatformSet mapToPlatformSet(ArrayRef<Triple> Targets);
 StringRef getPlatformName(PlatformKind Platform);
 PlatformKind getPlatformFromName(StringRef Name);
-std::string getOSAndEnvironmentName(PlatformKind Platform,
-                                    std::string Version = "");
 
 } // end namespace MachO.
 } // end namespace llvm.

llvm/include/llvm/TextAPI/Symbol.h

@@ -105,17 +105,12 @@ class Symbol {
 #endif
 
   bool operator==(const Symbol &O) const {
-    return std::tie(Name, Kind, Targets, Flags) ==
-           std::tie(O.Name, O.Kind, O.Targets, O.Flags);
+    return (Kind == O.Kind) && (Name == O.Name) && (Targets == O.Targets) &&
+           (Flags == O.Flags);
   }
 
   bool operator!=(const Symbol &O) const { return !(*this == O); }
 
-  bool operator<(const Symbol &O) const {
-    return std::tie(Name, Kind, Targets, Flags) <
-           std::tie(O.Name, O.Kind, O.Targets, O.Flags);
-  }
-
 private:
   StringRef Name;
   TargetList Targets;

llvm/include/llvm/TextAPI/Target.h

@@ -60,8 +60,6 @@ inline bool operator!=(const Target &LHS, const Architecture &RHS) {
 PlatformSet mapToPlatformSet(ArrayRef<Target> Targets);
 ArchitectureSet mapToArchitectureSet(ArrayRef<Target> Targets);
 
-std::string getTargetTripleName(const Target &Targ);
-
 raw_ostream &operator<<(raw_ostream &OS, const Target &Target);
 
 } // namespace MachO

llvm/lib/TextAPI/Platform.cpp

@@ -105,34 +105,5 @@ PlatformKind getPlatformFromName(StringRef Name) {
       .Default(PlatformKind::unknown);
 }
 
-std::string getOSAndEnvironmentName(PlatformKind Platform,
-                                    std::string Version) {
-  switch (Platform) {
-  case PlatformKind::unknown:
-    return "darwin" + Version;
-  case PlatformKind::macOS:
-    return "macos" + Version;
-  case PlatformKind::iOS:
-    return "ios" + Version;
-  case PlatformKind::tvOS:
-    return "tvos" + Version;
-  case PlatformKind::watchOS:
-    return "watchos" + Version;
-  case PlatformKind::bridgeOS:
-    return "bridgeos" + Version;
-  case PlatformKind::macCatalyst:
-    return "ios" + Version + "-macabi";
-  case PlatformKind::iOSSimulator:
-    return "ios" + Version + "-simulator";
-  case PlatformKind::tvOSSimulator:
-    return "tvos" + Version + "-simulator";
-  case PlatformKind::watchOSSimulator:
-    return "watchos" + Version + "-simulator";
-  case PlatformKind::driverKit:
-    return "driverkit" + Version;
-  }
-  llvm_unreachable("Unknown llvm::MachO::PlatformKind enum");
-}
-
 } // end namespace MachO.
 } // end namespace llvm.

llvm/lib/TextAPI/Target.cpp

@@ -72,11 +72,5 @@ ArchitectureSet mapToArchitectureSet(ArrayRef<Target> Targets) {
   return Result;
 }
 
-std::string getTargetTripleName(const Target &Targ) {
-  return (getArchitectureName(Targ.Arch) + "-apple-" +
-          getOSAndEnvironmentName(Targ.Platform))
-      .str();
-}
-
 } // end namespace MachO.
 } // end namespace llvm.

llvm/test/CMakeLists.txt

@@ -116,7 +116,6 @@ set(LLVM_TEST_DEPENDS
           llvm-strip
           llvm-symbolizer
           llvm-tblgen
-          llvm-tapi-diff
           llvm-undname
           llvm-windres
           llvm-xray

llvm/test/lit.cfg.py

@@ -164,7 +164,7 @@ def get_asan_rtlib():
     'llvm-modextract', 'llvm-nm', 'llvm-objcopy', 'llvm-objdump', 'llvm-otool',
     'llvm-pdbutil', 'llvm-profdata', 'llvm-profgen', 'llvm-ranlib', 'llvm-rc', 'llvm-readelf',
     'llvm-readobj', 'llvm-rtdyld', 'llvm-size', 'llvm-split', 'llvm-strings',
-    'llvm-strip', 'llvm-tblgen', 'llvm-tapi-diff', 'llvm-undname', 'llvm-windres',
+    'llvm-strip', 'llvm-tblgen', 'llvm-undname', 'llvm-windres',
     'llvm-c-test', 'llvm-cxxfilt',
     'llvm-xray', 'yaml2obj', 'obj2yaml', 'yaml-bench', 'verify-uselistorder',
     'bugpoint', 'llc', 'llvm-symbolizer', 'opt', 'sancov', 'sanstats'])