Skip to content

Commit e7b755e

Browse files
cyndyishidacyndyishida
committed
Revert "Reland "[llvm] llvm-tapi-diff""
This reverts commit 20126c9. The sorting fixes failed to have stable output on different platforms.
1 parent 1899cb7 commit e7b755e

27 files changed

+3
-1694
lines changed

‎llvm/include/llvm/Object/TapiUniversal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ class TapiUniversal : public Binary {
101101
return make_range(begin_objects(), end_objects());
102102
}
103103

104-
const MachO::InterfaceFile &getInterfaceFile() { return *ParsedFile; }
105-
106104
uint32_t getNumberOfObjects() const { return Libraries.size(); }
107105

108106
static bool classof(const Binary *v) { return v->isTapiUniversal(); }

‎llvm/include/llvm/TextAPI/Platform.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ PlatformKind mapToPlatformKind(const Triple &Target);
4040
PlatformSet mapToPlatformSet(ArrayRef<Triple> Targets);
4141
StringRef getPlatformName(PlatformKind Platform);
4242
PlatformKind getPlatformFromName(StringRef Name);
43-
std::string getOSAndEnvironmentName(PlatformKind Platform,
44-
std::string Version = "");
4543

4644
} // end namespace MachO.
4745
} // end namespace llvm.

‎llvm/include/llvm/TextAPI/Symbol.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,12 @@ class Symbol {
105105
#endif
106106

107107
bool operator==(const Symbol &O) const {
108-
return std::tie(Name, Kind, Targets, Flags) ==
109-
std::tie(O.Name, O.Kind, O.Targets, O.Flags);
108+
return (Kind == O.Kind) && (Name == O.Name) && (Targets == O.Targets) &&
109+
(Flags == O.Flags);
110110
}
111111

112112
bool operator!=(const Symbol &O) const { return !(*this == O); }
113113

114-
bool operator<(const Symbol &O) const {
115-
return std::tie(Name, Kind, Targets, Flags) <
116-
std::tie(O.Name, O.Kind, O.Targets, O.Flags);
117-
}
118-
119114
private:
120115
StringRef Name;
121116
TargetList Targets;

‎llvm/include/llvm/TextAPI/Target.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ inline bool operator!=(const Target &LHS, const Architecture &RHS) {
6060
PlatformSet mapToPlatformSet(ArrayRef<Target> Targets);
6161
ArchitectureSet mapToArchitectureSet(ArrayRef<Target> Targets);
6262

63-
std::string getTargetTripleName(const Target &Targ);
64-
6563
raw_ostream &operator<<(raw_ostream &OS, const Target &Target);
6664

6765
} // namespace MachO

‎llvm/lib/TextAPI/Platform.cpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -105,34 +105,5 @@ PlatformKind getPlatformFromName(StringRef Name) {
105105
.Default(PlatformKind::unknown);
106106
}
107107

108-
std::string getOSAndEnvironmentName(PlatformKind Platform,
109-
std::string Version) {
110-
switch (Platform) {
111-
case PlatformKind::unknown:
112-
return "darwin" + Version;
113-
case PlatformKind::macOS:
114-
return "macos" + Version;
115-
case PlatformKind::iOS:
116-
return "ios" + Version;
117-
case PlatformKind::tvOS:
118-
return "tvos" + Version;
119-
case PlatformKind::watchOS:
120-
return "watchos" + Version;
121-
case PlatformKind::bridgeOS:
122-
return "bridgeos" + Version;
123-
case PlatformKind::macCatalyst:
124-
return "ios" + Version + "-macabi";
125-
case PlatformKind::iOSSimulator:
126-
return "ios" + Version + "-simulator";
127-
case PlatformKind::tvOSSimulator:
128-
return "tvos" + Version + "-simulator";
129-
case PlatformKind::watchOSSimulator:
130-
return "watchos" + Version + "-simulator";
131-
case PlatformKind::driverKit:
132-
return "driverkit" + Version;
133-
}
134-
llvm_unreachable("Unknown llvm::MachO::PlatformKind enum");
135-
}
136-
137108
} // end namespace MachO.
138109
} // end namespace llvm.

‎llvm/lib/TextAPI/Target.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,5 @@ ArchitectureSet mapToArchitectureSet(ArrayRef<Target> Targets) {
7272
return Result;
7373
}
7474

75-
std::string getTargetTripleName(const Target &Targ) {
76-
return (getArchitectureName(Targ.Arch) + "-apple-" +
77-
getOSAndEnvironmentName(Targ.Platform))
78-
.str();
79-
}
80-
8175
} // end namespace MachO.
8276
} // end namespace llvm.

‎llvm/test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ set(LLVM_TEST_DEPENDS
116116
llvm-strip
117117
llvm-symbolizer
118118
llvm-tblgen
119-
llvm-tapi-diff
120119
llvm-undname
121120
llvm-windres
122121
llvm-xray

‎llvm/test/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def get_asan_rtlib():
164164
'llvm-modextract', 'llvm-nm', 'llvm-objcopy', 'llvm-objdump', 'llvm-otool',
165165
'llvm-pdbutil', 'llvm-profdata', 'llvm-profgen', 'llvm-ranlib', 'llvm-rc', 'llvm-readelf',
166166
'llvm-readobj', 'llvm-rtdyld', 'llvm-size', 'llvm-split', 'llvm-strings',
167-
'llvm-strip', 'llvm-tblgen', 'llvm-tapi-diff', 'llvm-undname', 'llvm-windres',
167+
'llvm-strip', 'llvm-tblgen', 'llvm-undname', 'llvm-windres',
168168
'llvm-c-test', 'llvm-cxxfilt',
169169
'llvm-xray', 'yaml2obj', 'obj2yaml', 'yaml-bench', 'verify-uselistorder',
170170
'bugpoint', 'llc', 'llvm-symbolizer', 'opt', 'sancov', 'sanstats'])

‎llvm/test/tools/llvm-tapi-diff/Inputs/macho.yaml

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎llvm/test/tools/llvm-tapi-diff/Inputs/v4A.tbd

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)