[llvm][TextAPI] add simulators to output

[cishida]

Summary

• for <= tbd_v3, simulator platforms appear the same as the real

platform and we distinct the difference from the architecture.

fixes: rdar://problem/59161559

[ributzka]

llvm/lib/TextAPI/MachO/TextStubCommon.cpp

68

You could simplify this to use fall-throughs for all the simulator platforms.

[cishida]

llvm/lib/TextAPI/MachO/TextStubCommon.cpp

68

wouldn't that trigger a warning with -Wimplicit-fallthrough?

[ributzka]

llvm/lib/TextAPI/MachO/TextStubCommon.cpp

68

You can use LLVM_FALLTHROUGH to silence that warning.

[cishida]

Updating to use LLVM_FALLTHROUGH for cases

[ributzka]

LGTM

[cishida]

will resolve the warning: invalid case style for variable '...' [readability-identifier-naming] in a future patch since it'll cause mismatching conventions through the whole file.

llvm/lib/TextAPI/MachO/TextStubCommon.cpp

default:
     llvm_unreachable("unexpected platform");
     break;
   case PlatformKind::macOS:
     OS << "macosx";
     break;
   case PlatformKind::iOS:
     OS << "ios";
     break;
+  case PlatformKind::iOSSimulator:
+    OS << "ios";
+    break;
   case PlatformKind::watchOS:
     OS << "watchos";
     break;
+  case PlatformKind::watchOSSimulator:
+    OS << "watchos";
+    break;
   case PlatformKind::tvOS:
     OS << "tvos";
     break;
+  case PlatformKind::tvOSSimulator:
+    OS << "tvos";
+    break;
   case PlatformKind::bridgeOS:
     OS << "bridgeos";
     break;
   case PlatformKind::macCatalyst:
     OS << "iosmac";
     break;
   }
 }

llvm/unittests/TextAPI/TextStubV3Tests.cpp

TEST(TBDv3, Platform_zippered) {
   SmallString<4096> Buffer;
   raw_svector_ostream OS(Buffer);
   auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
   EXPECT_TRUE(!WriteResult);
   EXPECT_EQ(stripWhitespace(tbd_v3_platform_zip),
             stripWhitespace(Buffer.c_str()));
 }
 
+TEST(TBDv3, Platform_iOSSim) {
+  static const char tbd_v3_platform_iossim[] = "--- !tapi-tbd-v3\n"
+                                               "archs: [ x86_64 ]\n"
+                                               "platform: ios\n"
+                                               "install-name: Test.dylib\n"
+                                               "...\n";
+
+  auto Result =
+      TextAPIReader::get(MemoryBufferRef(tbd_v3_platform_iossim, "Test.tbd"));
+  EXPECT_TRUE(!!Result);
+  auto Platform = PlatformKind::iOSSimulator;
+  auto File = std::move(Result.get());
+  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
+  EXPECT_EQ(File->getPlatforms().size(), 1U);
+  EXPECT_EQ(Platform, *File->getPlatforms().begin());
+
+  SmallString<4096> Buffer;
+  raw_svector_ostream OS(Buffer);
+  auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
+  EXPECT_TRUE(!WriteResult);
+  EXPECT_EQ(stripWhitespace(tbd_v3_platform_iossim),
+            stripWhitespace(Buffer.c_str()));
+}
+
+TEST(TBDv3, Platform_watchOSSim) {
+  static const char tbd_v3_platform_watchossim[] = "--- !tapi-tbd-v3\n"
+                                                   "archs: [ x86_64 ]\n"
+                                                   "platform: watchos\n"
+                                                   "install-name: Test.dylib\n"
+                                                   "...\n";
+
+  auto Result = TextAPIReader::get(
+      MemoryBufferRef(tbd_v3_platform_watchossim, "Test.tbd"));
+  EXPECT_TRUE(!!Result);
+  auto Platform = PlatformKind::watchOSSimulator;
+  auto File = std::move(Result.get());
+  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
+  EXPECT_EQ(File->getPlatforms().size(), 1U);
+  EXPECT_EQ(Platform, *File->getPlatforms().begin());
+
+  SmallString<4096> Buffer;
+  raw_svector_ostream OS(Buffer);
+  auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
+  EXPECT_TRUE(!WriteResult);
+  EXPECT_EQ(stripWhitespace(tbd_v3_platform_watchossim),
+            stripWhitespace(Buffer.c_str()));
+}
+
+TEST(TBDv3, Platform_tvOSSim) {
+  static const char tbd_v3_platform_tvossim[] = "--- !tapi-tbd-v3\n"
+                                                "archs: [ x86_64 ]\n"
+                                                "platform: tvos\n"
+                                                "install-name: Test.dylib\n"
+                                                "...\n";
+
+  auto Result =
+      TextAPIReader::get(MemoryBufferRef(tbd_v3_platform_tvossim, "Test.tbd"));
+  EXPECT_TRUE(!!Result);
+  auto File = std::move(Result.get());
+  auto Platform = PlatformKind::tvOSSimulator;
+  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
+  EXPECT_EQ(File->getPlatforms().size(), 1U);
+  EXPECT_EQ(Platform, *File->getPlatforms().begin());
+
+  SmallString<4096> Buffer;
+  raw_svector_ostream OS(Buffer);
+  auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
+  EXPECT_TRUE(!WriteResult);
+  EXPECT_EQ(stripWhitespace(tbd_v3_platform_tvossim),
+            stripWhitespace(Buffer.c_str()));
+}
+
 TEST(TBDv3, Swift_1_0) {
   static const char tbd_v3_swift_1_0[] = "--- !tapi-tbd-v3\n"
                                          "archs: [ arm64 ]\n"
                                          "platform: ios\n"
                                          "install-name: Test.dylib\n"
                                          "swift-abi-version: 1.0\n"
                                          "...\n";