Skip to content

Commit

Permalink
Revert "[llvm] llvm-tapi-diff"
Browse files Browse the repository at this point in the history
This reverts commit d1d36f7.
Reverting this patch to investigate linux bot failures
 + fix with author offline
  • Loading branch information
cyndyishida committed Jun 4, 2021
1 parent d71ff90 commit 5337c75
Show file tree
Hide file tree
Showing 25 changed files with 2 additions and 1,646 deletions.
2 changes: 0 additions & 2 deletions llvm/include/llvm/Object/TapiUniversal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(); }
Expand Down
2 changes: 0 additions & 2 deletions llvm/include/llvm/TextAPI/Platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 2 additions & 7 deletions llvm/include/llvm/TextAPI/Symbol.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions llvm/include/llvm/TextAPI/Target.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 0 additions & 29 deletions llvm/lib/TextAPI/Platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 0 additions & 6 deletions llvm/lib/TextAPI/Target.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
141 changes: 0 additions & 141 deletions llvm/test/tools/llvm-tapi-diff/Inputs/macho.yaml

This file was deleted.

49 changes: 0 additions & 49 deletions llvm/test/tools/llvm-tapi-diff/Inputs/v4A.tbd

This file was deleted.

55 changes: 0 additions & 55 deletions llvm/test/tools/llvm-tapi-diff/Inputs/v4B.tbd

This file was deleted.

49 changes: 0 additions & 49 deletions llvm/test/tools/llvm-tapi-diff/Inputs/v4C.tbd

This file was deleted.

Loading

0 comments on commit 5337c75

Please sign in to comment.