[TextAPI] Switch back to a custom Platform enum.

Moving to PlatformType from BinaryFormat had some UB fallout when handing
unknown platforms or malformed input files.

This should fix the sanitizer bots.

llvm-svn: 347836

2 files changed, 16 insertions, 16 deletions

diff --git a/llvm/unittests/TextAPI/TextStubV1Tests.cpp b/llvm/unittests/TextAPI/TextStubV1Tests.cpp
index d68361d65af..c37ca844e22 100644
--- a/llvm/unittests/TextAPI/TextStubV1Tests.cpp
+++ b/llvm/unittests/TextAPI/TextStubV1Tests.cpp
@@ -90,7 +90,7 @@ TEST(TBDv1, ReadFile) {
   auto Archs = Architecture::armv7 | Architecture::armv7s |
                Architecture::armv7k | Architecture::arm64;
   EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::iOS, File->getPlatform());
   EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
   EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());
   EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
@@ -136,7 +136,7 @@ TEST(TBDv1, ReadFile2) {
   auto Archs = Architecture::armv7 | Architecture::armv7s |
                Architecture::armv7k | Architecture::arm64;
   EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::iOS, File->getPlatform());
   EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
   EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion());
   EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
@@ -177,7 +177,7 @@ TEST(TBDv1, WriteFile) {
   File.setInstallName("/usr/lib/libfoo.dylib");
   File.setFileType(FileType::TBD_V1);
   File.setArchitectures(Architecture::i386 | Architecture::x86_64);
-  File.setPlatform(PLATFORM_MACOS);
+  File.setPlatform(PlatformKind::macOS);
   File.setCurrentVersion(PackedVersion(1, 2, 3));
   File.setSwiftABIVersion(5);
   File.setObjCConstraint(ObjCConstraintType::Retain_Release);
@@ -213,7 +213,7 @@ TEST(TBDv1, Platform_macOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(PLATFORM_MACOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::macOS, File->getPlatform());
 }
 
 TEST(TBDv1, Platform_iOS) {
@@ -228,7 +228,7 @@ TEST(TBDv1, Platform_iOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::iOS, File->getPlatform());
 }
 
 TEST(TBDv1, Platform_watchOS) {
@@ -243,7 +243,7 @@ TEST(TBDv1, Platform_watchOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(PLATFORM_WATCHOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::watchOS, File->getPlatform());
 }
 
 TEST(TBDv1, Platform_tvOS) {
@@ -258,7 +258,7 @@ TEST(TBDv1, Platform_tvOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(PLATFORM_TVOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::tvOS, File->getPlatform());
 }
 
 TEST(TBDv1, Platform_bridgeOS) {
@@ -274,7 +274,7 @@ TEST(TBDv1, Platform_bridgeOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V1, File->getFileType());
-  EXPECT_EQ(PLATFORM_BRIDGEOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::bridgeOS, File->getPlatform());
 }
 
 TEST(TBDv1, Swift_1_0) {
diff --git a/llvm/unittests/TextAPI/TextStubV2Tests.cpp b/llvm/unittests/TextAPI/TextStubV2Tests.cpp
index 62032422dd7..5a22ac4cef2 100644
--- a/llvm/unittests/TextAPI/TextStubV2Tests.cpp
+++ b/llvm/unittests/TextAPI/TextStubV2Tests.cpp
@@ -92,7 +92,7 @@ TEST(TBDv2, ReadFile) {
   auto Archs = Architecture::armv7 | Architecture::armv7s |
                Architecture::armv7k | Architecture::arm64;
   EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::iOS, File->getPlatform());
   EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
   EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());
   EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
@@ -160,7 +160,7 @@ TEST(TBDv2, ReadFile2) {
   auto Archs = Architecture::armv7 | Architecture::armv7s |
                Architecture::armv7k | Architecture::arm64;
   EXPECT_EQ(Archs, File->getArchitectures());
-  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::iOS, File->getPlatform());
   EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());
   EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion());
   EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());
@@ -200,7 +200,7 @@ TEST(TBDv2, WriteFile) {
   File.setInstallName("/usr/lib/libfoo.dylib");
   File.setFileType(FileType::TBD_V2);
   File.setArchitectures(Architecture::i386 | Architecture::x86_64);
-  File.setPlatform(PLATFORM_MACOS);
+  File.setPlatform(PlatformKind::macOS);
   File.setCurrentVersion(PackedVersion(1, 2, 3));
   File.setTwoLevelNamespace();
   File.setApplicationExtensionSafe();
@@ -238,7 +238,7 @@ TEST(TBDv2, Platform_macOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(PLATFORM_MACOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::macOS, File->getPlatform());
 }
 
 TEST(TBDv2, Platform_iOS) {
@@ -253,7 +253,7 @@ TEST(TBDv2, Platform_iOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::iOS, File->getPlatform());
 }
 
 TEST(TBDv2, Platform_watchOS) {
@@ -268,7 +268,7 @@ TEST(TBDv2, Platform_watchOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(PLATFORM_WATCHOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::watchOS, File->getPlatform());
 }
 
 TEST(TBDv2, Platform_tvOS) {
@@ -283,7 +283,7 @@ TEST(TBDv2, Platform_tvOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(PLATFORM_TVOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::tvOS, File->getPlatform());
 }
 
 TEST(TBDv2, Platform_bridgeOS) {
@@ -299,7 +299,7 @@ TEST(TBDv2, Platform_bridgeOS) {
   EXPECT_TRUE(!!Result);
   auto File = std::move(Result.get());
   EXPECT_EQ(FileType::TBD_V2, File->getFileType());
-  EXPECT_EQ(PLATFORM_BRIDGEOS, File->getPlatform());
+  EXPECT_EQ(PlatformKind::bridgeOS, File->getPlatform());
 }
 
 TEST(TBDv2, Swift_1_0) {