[PATCH] D75688: [TextAPI] Teach TextAPI about arm64e

[Juergen Ributzka via llvm-commits]

LGTM

> On Mar 5, 2020, at 12:39 PM, Cyndy Ishida via Phabricator <reviews at reviews.llvm.org> wrote:
> 
> cishida updated this revision to Diff 248569.
> cishida added a comment.
> 
> updating Kuba's patch with tests
> 
> 
> Repository:
>  rG LLVM Github Monorepo
> 
> CHANGES SINCE LAST ACTION
>  https://reviews.llvm.org/D75688/new/
> 
> https://reviews.llvm.org/D75688
> 
> Files:
>  llvm/include/llvm/TextAPI/MachO/Architecture.def
>  llvm/unittests/TextAPI/TextStubV3Tests.cpp
>  llvm/unittests/TextAPI/TextStubV4Tests.cpp
> 
> 
> Index: llvm/unittests/TextAPI/TextStubV4Tests.cpp
> ===================================================================
> --- llvm/unittests/TextAPI/TextStubV4Tests.cpp
> +++ llvm/unittests/TextAPI/TextStubV4Tests.cpp
> @@ -375,6 +375,28 @@
>             stripWhitespace(Buffer.c_str()));
> }
> 
> +TEST(TBDv4, Target_arm_iOS) {
> +  static const char tbdv4_arm64e[] = "--- !tapi-tbd\n"
> +                                     "tbd-version: 4\n"
> +                                     "targets: [  arm64e-ios ]\n"
> +                                     "install-name: Test.dylib\n"
> +                                     "...\n";
> +
> +  auto Result = TextAPIReader::get(MemoryBufferRef(tbdv4_arm64e, "Test.tbd"));
> +  EXPECT_TRUE(!!Result);
> +  auto File = std::move(Result.get());
> +  EXPECT_EQ(FileType::TBD_V4, File->getFileType());
> +  EXPECT_EQ(File->getPlatforms().size(), 1U);
> +  EXPECT_EQ(PlatformKind::iOS, *File->getPlatforms().begin());
> +  EXPECT_EQ(ArchitectureSet(AK_arm64e), File->getArchitectures());
> +
> +  SmallString<4096> Buffer;
> +  raw_svector_ostream OS(Buffer);
> +  auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
> +  EXPECT_TRUE(!WriteResult);
> +  EXPECT_EQ(stripWhitespace(tbdv4_arm64e), stripWhitespace(Buffer.c_str()));
> +}
> +
> TEST(TBDv4, Target_x86_macos) {
>   static const char tbd_x86_macos[] = "--- !tapi-tbd\n"
>                                       "tbd-version: 4\n"
> Index: llvm/unittests/TextAPI/TextStubV3Tests.cpp
> ===================================================================
> --- llvm/unittests/TextAPI/TextStubV3Tests.cpp
> +++ llvm/unittests/TextAPI/TextStubV3Tests.cpp
> @@ -408,6 +408,31 @@
>             stripWhitespace(Buffer.c_str()));
> }
> 
> +TEST(TBDv3, Arch_arm64e) {
> +  static const char TBDv3ArchArm64e[] = "--- !tapi-tbd-v3\n"
> +                                        "archs: [ arm64, arm64e ]\n"
> +                                        "platform: ios\n"
> +                                        "install-name: Test.dylib\n"
> +                                        "...\n";
> +
> +  auto Result =
> +      TextAPIReader::get(MemoryBufferRef(TBDv3ArchArm64e, "Test.tbd"));
> +  EXPECT_TRUE(!!Result);
> +  auto File = std::move(Result.get());
> +  auto Platform = PlatformKind::iOS;
> +  auto Archs = AK_arm64 | AK_arm64e;
> +  EXPECT_EQ(FileType::TBD_V3, File->getFileType());
> +  EXPECT_EQ(File->getPlatforms().size(), 1U);
> +  EXPECT_EQ(Platform, *File->getPlatforms().begin());
> +  EXPECT_EQ(Archs, File->getArchitectures());
> +
> +  SmallString<4096> Buffer;
> +  raw_svector_ostream OS(Buffer);
> +  auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
> +  EXPECT_TRUE(!WriteResult);
> +  EXPECT_EQ(stripWhitespace(TBDv3ArchArm64e), stripWhitespace(Buffer.c_str()));
> +}
> +
> TEST(TBDv3, Swift_1_0) {
>   static const char TBDv3Swift1[] = "--- !tapi-tbd-v3\n"
>                                     "archs: [ arm64 ]\n"
> Index: llvm/include/llvm/TextAPI/MachO/Architecture.def
> ===================================================================
> --- llvm/include/llvm/TextAPI/MachO/Architecture.def
> +++ llvm/include/llvm/TextAPI/MachO/Architecture.def
> @@ -36,3 +36,4 @@
> /// ARM64 architectures sorted by cpu sub type id.
> ///
> ARCHINFO(arm64, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64_ALL)
> +ARCHINFO(arm64e, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64E)
> 
> 
> <D75688.248569.patch>