diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2022-01-27 22:17:16 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:44:34 +0000 |
commit | 04eeddc0aa8e0a417a16eaf9d7d095207f4a8623 (patch) | |
tree | 2a5d3b2fe5c852e91531d128d9177754572d5338 /contrib/llvm-project/llvm/lib/TextAPI | |
parent | 0eae32dcef82f6f06de6419a0d623d7def0cc8f6 (diff) | |
parent | 6f8fc217eaa12bf657be1c6468ed9938d10168b3 (diff) | |
download | src-04eeddc0aa8e0a417a16eaf9d7d095207f4a8623.tar.gz src-04eeddc0aa8e0a417a16eaf9d7d095207f4a8623.zip |
Merge llvm-project main llvmorg-14-init-17616-g024a1fab5c35
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-17616-g024a1fab5c35.
PR: 261742
MFC after: 2 weeks
Diffstat (limited to 'contrib/llvm-project/llvm/lib/TextAPI')
7 files changed, 120 insertions, 123 deletions
diff --git a/contrib/llvm-project/llvm/lib/TextAPI/Architecture.cpp b/contrib/llvm-project/llvm/lib/TextAPI/Architecture.cpp index e1901d5c0ce5..bb349b21774e 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/Architecture.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/Architecture.cpp @@ -15,7 +15,7 @@ #include "llvm/ADT/Triple.h" #include "llvm/BinaryFormat/MachO.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/TextAPI/ArchitectureSet.h" +#include "llvm/Support/ErrorHandling.h" namespace llvm { namespace MachO { diff --git a/contrib/llvm-project/llvm/lib/TextAPI/PackedVersion.cpp b/contrib/llvm-project/llvm/lib/TextAPI/PackedVersion.cpp index f8171e02b6d3..67fb30aeb127 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/PackedVersion.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/PackedVersion.cpp @@ -11,7 +11,6 @@ //===----------------------------------------------------------------------===// #include "llvm/TextAPI/PackedVersion.h" -#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/Format.h" diff --git a/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp b/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp index a2ce6d0cac86..c3c74252301e 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp @@ -18,120 +18,118 @@ namespace llvm { namespace MachO { -PlatformKind mapToPlatformKind(PlatformKind Platform, bool WantSim) { +PlatformType mapToPlatformType(PlatformType Platform, bool WantSim) { switch (Platform) { default: return Platform; - case PlatformKind::iOS: - return WantSim ? PlatformKind::iOSSimulator : PlatformKind::iOS; - case PlatformKind::tvOS: - return WantSim ? PlatformKind::tvOSSimulator : PlatformKind::tvOS; - case PlatformKind::watchOS: - return WantSim ? PlatformKind::watchOSSimulator : PlatformKind::watchOS; + case PLATFORM_IOS: + return WantSim ? PLATFORM_IOSSIMULATOR : PLATFORM_IOS; + case PLATFORM_TVOS: + return WantSim ? PLATFORM_TVOSSIMULATOR : PLATFORM_TVOS; + case PLATFORM_WATCHOS: + return WantSim ? PLATFORM_WATCHOSSIMULATOR : PLATFORM_WATCHOS; } - llvm_unreachable("Unknown llvm::MachO::PlatformKind enum"); } -PlatformKind mapToPlatformKind(const Triple &Target) { +PlatformType mapToPlatformType(const Triple &Target) { switch (Target.getOS()) { default: - return PlatformKind::unknown; + return PLATFORM_UNKNOWN; case Triple::MacOSX: - return PlatformKind::macOS; + return PLATFORM_MACOS; case Triple::IOS: if (Target.isSimulatorEnvironment()) - return PlatformKind::iOSSimulator; + return PLATFORM_IOSSIMULATOR; if (Target.getEnvironment() == Triple::MacABI) - return PlatformKind::macCatalyst; - return PlatformKind::iOS; + return PLATFORM_MACCATALYST; + return PLATFORM_IOS; case Triple::TvOS: - return Target.isSimulatorEnvironment() ? PlatformKind::tvOSSimulator - : PlatformKind::tvOS; + return Target.isSimulatorEnvironment() ? PLATFORM_TVOSSIMULATOR + : PLATFORM_TVOS; case Triple::WatchOS: - return Target.isSimulatorEnvironment() ? PlatformKind::watchOSSimulator - : PlatformKind::watchOS; + return Target.isSimulatorEnvironment() ? PLATFORM_WATCHOSSIMULATOR + : PLATFORM_WATCHOS; // TODO: add bridgeOS & driverKit once in llvm::Triple } - llvm_unreachable("Unknown Target Triple"); } PlatformSet mapToPlatformSet(ArrayRef<Triple> Targets) { PlatformSet Result; for (const auto &Target : Targets) - Result.insert(mapToPlatformKind(Target)); + Result.insert(mapToPlatformType(Target)); return Result; } -StringRef getPlatformName(PlatformKind Platform) { +StringRef getPlatformName(PlatformType Platform) { switch (Platform) { - case PlatformKind::unknown: + case PLATFORM_UNKNOWN: return "unknown"; - case PlatformKind::macOS: + case PLATFORM_MACOS: return "macOS"; - case PlatformKind::iOS: + case PLATFORM_IOS: return "iOS"; - case PlatformKind::tvOS: + case PLATFORM_TVOS: return "tvOS"; - case PlatformKind::watchOS: + case PLATFORM_WATCHOS: return "watchOS"; - case PlatformKind::bridgeOS: + case PLATFORM_BRIDGEOS: return "bridgeOS"; - case PlatformKind::macCatalyst: + case PLATFORM_MACCATALYST: return "macCatalyst"; - case PlatformKind::iOSSimulator: + case PLATFORM_IOSSIMULATOR: return "iOS Simulator"; - case PlatformKind::tvOSSimulator: + case PLATFORM_TVOSSIMULATOR: return "tvOS Simulator"; - case PlatformKind::watchOSSimulator: + case PLATFORM_WATCHOSSIMULATOR: return "watchOS Simulator"; - case PlatformKind::driverKit: + case PLATFORM_DRIVERKIT: return "DriverKit"; } - llvm_unreachable("Unknown llvm::MachO::PlatformKind enum"); + llvm_unreachable("Unknown llvm::MachO::PlatformType enum"); } -PlatformKind getPlatformFromName(StringRef Name) { - return StringSwitch<PlatformKind>(Name) - .Case("macos", PlatformKind::macOS) - .Case("ios", PlatformKind::iOS) - .Case("tvos", PlatformKind::tvOS) - .Case("watchos", PlatformKind::watchOS) - .Case("bridgeos", PlatformKind::macOS) - .Case("ios-macabi", PlatformKind::macCatalyst) - .Case("ios-simulator", PlatformKind::iOSSimulator) - .Case("tvos-simulator", PlatformKind::tvOSSimulator) - .Case("watchos-simulator", PlatformKind::watchOSSimulator) - .Case("driverkit", PlatformKind::driverKit) - .Default(PlatformKind::unknown); +PlatformType getPlatformFromName(StringRef Name) { + return StringSwitch<PlatformType>(Name) + .Case("macos", PLATFORM_MACOS) + .Case("ios", PLATFORM_IOS) + .Case("tvos", PLATFORM_TVOS) + .Case("watchos", PLATFORM_WATCHOS) + .Case("bridgeos", PLATFORM_BRIDGEOS) + .Case("ios-macabi", PLATFORM_MACCATALYST) + .Case("ios-simulator", PLATFORM_IOSSIMULATOR) + .Case("tvos-simulator", PLATFORM_TVOSSIMULATOR) + .Case("watchos-simulator", PLATFORM_WATCHOSSIMULATOR) + .Case("driverkit", PLATFORM_DRIVERKIT) + .Default(PLATFORM_UNKNOWN); } -std::string getOSAndEnvironmentName(PlatformKind Platform, +std::string getOSAndEnvironmentName(PlatformType Platform, std::string Version) { switch (Platform) { - case PlatformKind::unknown: + case PLATFORM_UNKNOWN: return "darwin" + Version; - case PlatformKind::macOS: + case PLATFORM_MACOS: return "macos" + Version; - case PlatformKind::iOS: + case PLATFORM_IOS: return "ios" + Version; - case PlatformKind::tvOS: + case PLATFORM_TVOS: return "tvos" + Version; - case PlatformKind::watchOS: + case PLATFORM_WATCHOS: return "watchos" + Version; - case PlatformKind::bridgeOS: + case PLATFORM_BRIDGEOS: return "bridgeos" + Version; - case PlatformKind::macCatalyst: + case PLATFORM_MACCATALYST: return "ios" + Version + "-macabi"; - case PlatformKind::iOSSimulator: + case PLATFORM_IOSSIMULATOR: return "ios" + Version + "-simulator"; - case PlatformKind::tvOSSimulator: + case PLATFORM_TVOSSIMULATOR: return "tvos" + Version + "-simulator"; - case PlatformKind::watchOSSimulator: + case PLATFORM_WATCHOSSIMULATOR: return "watchos" + Version + "-simulator"; - case PlatformKind::driverKit: + case PLATFORM_DRIVERKIT: return "driverkit" + Version; } - llvm_unreachable("Unknown llvm::MachO::PlatformKind enum"); + llvm_unreachable("Unknown llvm::MachO::PlatformType enum"); } } // end namespace MachO. diff --git a/contrib/llvm-project/llvm/lib/TextAPI/Target.cpp b/contrib/llvm-project/llvm/lib/TextAPI/Target.cpp index 35fe1bf65e6f..c54c3bd66b9d 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/Target.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/Target.cpp @@ -7,11 +7,8 @@ //===----------------------------------------------------------------------===// #include "llvm/TextAPI/Target.h" -#include "llvm/ADT/SmallString.h" -#include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/Support/Format.h" +#include "llvm/ADT/Twine.h" #include "llvm/Support/raw_ostream.h" namespace llvm { @@ -22,26 +19,26 @@ Expected<Target> Target::create(StringRef TargetValue) { auto ArchitectureStr = Result.first; auto Architecture = getArchitectureFromName(ArchitectureStr); auto PlatformStr = Result.second; - PlatformKind Platform; - Platform = StringSwitch<PlatformKind>(PlatformStr) - .Case("macos", PlatformKind::macOS) - .Case("ios", PlatformKind::iOS) - .Case("tvos", PlatformKind::tvOS) - .Case("watchos", PlatformKind::watchOS) - .Case("bridgeos", PlatformKind::bridgeOS) - .Case("maccatalyst", PlatformKind::macCatalyst) - .Case("ios-simulator", PlatformKind::iOSSimulator) - .Case("tvos-simulator", PlatformKind::tvOSSimulator) - .Case("watchos-simulator", PlatformKind::watchOSSimulator) - .Case("driverkit", PlatformKind::driverKit) - .Default(PlatformKind::unknown); + PlatformType Platform; + Platform = StringSwitch<PlatformType>(PlatformStr) + .Case("macos", PLATFORM_MACOS) + .Case("ios", PLATFORM_IOS) + .Case("tvos", PLATFORM_TVOS) + .Case("watchos", PLATFORM_WATCHOS) + .Case("bridgeos", PLATFORM_BRIDGEOS) + .Case("maccatalyst", PLATFORM_MACCATALYST) + .Case("ios-simulator", PLATFORM_IOSSIMULATOR) + .Case("tvos-simulator", PLATFORM_TVOSSIMULATOR) + .Case("watchos-simulator", PLATFORM_WATCHOSSIMULATOR) + .Case("driverkit", PLATFORM_DRIVERKIT) + .Default(PLATFORM_UNKNOWN); - if (Platform == PlatformKind::unknown) { + if (Platform == PLATFORM_UNKNOWN) { if (PlatformStr.startswith("<") && PlatformStr.endswith(">")) { PlatformStr = PlatformStr.drop_front().drop_back(); unsigned long long RawValue; if (!PlatformStr.getAsInteger(10, RawValue)) - Platform = (PlatformKind)RawValue; + Platform = (PlatformType)RawValue; } } diff --git a/contrib/llvm-project/llvm/lib/TextAPI/TextStub.cpp b/contrib/llvm-project/llvm/lib/TextAPI/TextStub.cpp index b64f19ab65cc..ff93e43356f7 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/TextStub.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/TextStub.cpp @@ -380,34 +380,34 @@ template <> struct ScalarTraits<Target> { default: OS << "unknown"; break; - case PlatformKind::macOS: + case PLATFORM_MACOS: OS << "macos"; break; - case PlatformKind::iOS: + case PLATFORM_IOS: OS << "ios"; break; - case PlatformKind::tvOS: + case PLATFORM_TVOS: OS << "tvos"; break; - case PlatformKind::watchOS: + case PLATFORM_WATCHOS: OS << "watchos"; break; - case PlatformKind::bridgeOS: + case PLATFORM_BRIDGEOS: OS << "bridgeos"; break; - case PlatformKind::macCatalyst: + case PLATFORM_MACCATALYST: OS << "maccatalyst"; break; - case PlatformKind::iOSSimulator: + case PLATFORM_IOSSIMULATOR: OS << "ios-simulator"; break; - case PlatformKind::tvOSSimulator: + case PLATFORM_TVOSSIMULATOR: OS << "tvos-simulator"; break; - case PlatformKind::watchOSSimulator: + case PLATFORM_WATCHOSSIMULATOR: OS << "watchos-simulator"; break; - case PlatformKind::driverKit: + case PLATFORM_DRIVERKIT: OS << "driverkit"; break; } @@ -423,7 +423,7 @@ template <> struct ScalarTraits<Target> { Value = *Result; if (Value.Arch == AK_unknown) return "unknown architecture"; - if (Value.Platform == PlatformKind::unknown) + if (Value.Platform == PLATFORM_UNKNOWN) return "unknown platform"; return {}; @@ -597,11 +597,10 @@ template <> struct MappingTraits<const InterfaceFile *> { TargetList Targets; for (auto Platform : Platforms) { - Platform = mapToPlatformKind(Platform, Architectures.hasX86()); + Platform = mapToPlatformType(Platform, Architectures.hasX86()); for (const auto &&Architecture : Architectures) { - if ((Architecture == AK_i386) && - (Platform == PlatformKind::macCatalyst)) + if ((Architecture == AK_i386) && (Platform == PLATFORM_MACCATALYST)) continue; Targets.emplace_back(Architecture, Platform); diff --git a/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.cpp b/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.cpp index c2713b9b5203..29b74f981a91 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.cpp @@ -49,8 +49,8 @@ void ScalarTraits<PlatformSet>::output(const PlatformSet &Values, void *IO, assert((!Ctx || Ctx->FileKind != FileType::Invalid) && "File type is not set in context"); - if (Ctx && Ctx->FileKind == TBD_V3 && Values.count(PlatformKind::macOS) && - Values.count(PlatformKind::macCatalyst)) { + if (Ctx && Ctx->FileKind == TBD_V3 && Values.count(PLATFORM_MACOS) && + Values.count(PLATFORM_MACCATALYST)) { OS << "zippered"; return; } @@ -60,31 +60,31 @@ void ScalarTraits<PlatformSet>::output(const PlatformSet &Values, void *IO, default: llvm_unreachable("unexpected platform"); break; - case PlatformKind::macOS: + case PLATFORM_MACOS: OS << "macosx"; break; - case PlatformKind::iOSSimulator: + case PLATFORM_IOSSIMULATOR: LLVM_FALLTHROUGH; - case PlatformKind::iOS: + case PLATFORM_IOS: OS << "ios"; break; - case PlatformKind::watchOSSimulator: + case PLATFORM_WATCHOSSIMULATOR: LLVM_FALLTHROUGH; - case PlatformKind::watchOS: + case PLATFORM_WATCHOS: OS << "watchos"; break; - case PlatformKind::tvOSSimulator: + case PLATFORM_TVOSSIMULATOR: LLVM_FALLTHROUGH; - case PlatformKind::tvOS: + case PLATFORM_TVOS: OS << "tvos"; break; - case PlatformKind::bridgeOS: + case PLATFORM_BRIDGEOS: OS << "bridgeos"; break; - case PlatformKind::macCatalyst: + case PLATFORM_MACCATALYST: OS << "iosmac"; break; - case PlatformKind::driverKit: + case PLATFORM_DRIVERKIT: OS << "driverkit"; break; } @@ -98,28 +98,27 @@ StringRef ScalarTraits<PlatformSet>::input(StringRef Scalar, void *IO, if (Scalar == "zippered") { if (Ctx && Ctx->FileKind == FileType::TBD_V3) { - Values.insert(PlatformKind::macOS); - Values.insert(PlatformKind::macCatalyst); + Values.insert(PLATFORM_MACOS); + Values.insert(PLATFORM_MACCATALYST); return {}; } return "invalid platform"; } - auto Platform = StringSwitch<PlatformKind>(Scalar) - .Case("unknown", PlatformKind::unknown) - .Case("macosx", PlatformKind::macOS) - .Case("ios", PlatformKind::iOS) - .Case("watchos", PlatformKind::watchOS) - .Case("tvos", PlatformKind::tvOS) - .Case("bridgeos", PlatformKind::bridgeOS) - .Case("iosmac", PlatformKind::macCatalyst) - .Default(PlatformKind::unknown); - - if (Platform == PlatformKind::macCatalyst) + auto Platform = StringSwitch<PlatformType>(Scalar) + .Case("macosx", PLATFORM_MACOS) + .Case("ios", PLATFORM_IOS) + .Case("watchos", PLATFORM_WATCHOS) + .Case("tvos", PLATFORM_TVOS) + .Case("bridgeos", PLATFORM_BRIDGEOS) + .Case("iosmac", PLATFORM_MACCATALYST) + .Default(PLATFORM_UNKNOWN); + + if (Platform == PLATFORM_MACCATALYST) if (Ctx && Ctx->FileKind != FileType::TBD_V3) return "invalid platform"; - if (Platform == PlatformKind::unknown) + if (Platform == PLATFORM_UNKNOWN) return "unknown platform"; Values.insert(Platform); @@ -226,7 +225,7 @@ StringRef ScalarTraits<UUID>::input(StringRef Scalar, void *, UUID &Value) { if (UUID.empty()) return "invalid uuid string pair"; Value.second = std::string(UUID); - Value.first = Target{getArchitectureFromName(Arch), PlatformKind::unknown}; + Value.first = Target{getArchitectureFromName(Arch), PLATFORM_UNKNOWN}; return {}; } diff --git a/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h b/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h index 89ae5d56297c..aac27221b5ff 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h +++ b/contrib/llvm-project/llvm/lib/TextAPI/TextStubCommon.h @@ -16,9 +16,9 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/YAMLTraits.h" #include "llvm/TextAPI/Architecture.h" -#include "llvm/TextAPI/ArchitectureSet.h" #include "llvm/TextAPI/InterfaceFile.h" -#include "llvm/TextAPI/PackedVersion.h" +#include "llvm/TextAPI/Platform.h" +#include "llvm/TextAPI/Target.h" using UUID = std::pair<llvm::MachO::Target, std::string>; @@ -28,6 +28,11 @@ LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(UUID) LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(FlowStringRef) namespace llvm { + +namespace MachO { + class ArchitectureSet; + class PackedVersion; +} namespace yaml { template <> struct ScalarTraits<FlowStringRef> { |