diff options
author | Cyndy Ishida <cyndy_ishida@apple.com> | 2023-07-24 14:25:21 -0700 |
---|---|---|
committer | Cyndy Ishida <cyndy_ishida@apple.com> | 2023-07-24 14:26:32 -0700 |
commit | a0666956b2c701596a90891a21bb22937c7b7e50 (patch) | |
tree | 1ed50c8658ea8162476622967048d13b943603ba /llvm/unittests/TextAPI | |
parent | 3a98e73169e1d8e4fbb739462eea62445db1a6c8 (diff) | |
download | llvm-a0666956b2c701596a90891a21bb22937c7b7e50.zip llvm-a0666956b2c701596a90891a21bb22937c7b7e50.tar.gz llvm-a0666956b2c701596a90891a21bb22937c7b7e50.tar.bz2 |
[TextAPI] Remove TBD file attributes that aren't used anymore.
UUID's & `installapi` flag are no longer useful in recent apple linker/tapi.
The reason for removing them is that these are attributes that record
how a library was built but not really about the library itself. TBD
files now only track information this is important as link time
dependencies.
Reviewed By: ributzka
Differential Revision: https://reviews.llvm.org/D149861
Diffstat (limited to 'llvm/unittests/TextAPI')
-rw-r--r-- | llvm/unittests/TextAPI/TextStubV1Tests.cpp | 2 | ||||
-rw-r--r-- | llvm/unittests/TextAPI/TextStubV2Tests.cpp | 2 | ||||
-rw-r--r-- | llvm/unittests/TextAPI/TextStubV3Tests.cpp | 11 | ||||
-rw-r--r-- | llvm/unittests/TextAPI/TextStubV4Tests.cpp | 67 |
4 files changed, 0 insertions, 82 deletions
diff --git a/llvm/unittests/TextAPI/TextStubV1Tests.cpp b/llvm/unittests/TextAPI/TextStubV1Tests.cpp index e2c6cd2..2ef30b3 100644 --- a/llvm/unittests/TextAPI/TextStubV1Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV1Tests.cpp @@ -86,7 +86,6 @@ TEST(TBDv1, ReadFile) { EXPECT_EQ(ObjCConstraintType::None, File->getObjCConstraint()); EXPECT_TRUE(File->isTwoLevelNamespace()); EXPECT_TRUE(File->isApplicationExtensionSafe()); - EXPECT_FALSE(File->isInstallAPI()); InterfaceFileRef client("clientA", Targets); InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Targets); EXPECT_EQ(1U, File->allowableClients().size()); @@ -140,7 +139,6 @@ TEST(TBDv1, ReadFile2) { EXPECT_EQ(ObjCConstraintType::None, File->getObjCConstraint()); EXPECT_TRUE(File->isTwoLevelNamespace()); EXPECT_TRUE(File->isApplicationExtensionSafe()); - EXPECT_FALSE(File->isInstallAPI()); EXPECT_EQ(0U, File->allowableClients().size()); EXPECT_EQ(0U, File->reexportedLibraries().size()); } diff --git a/llvm/unittests/TextAPI/TextStubV2Tests.cpp b/llvm/unittests/TextAPI/TextStubV2Tests.cpp index a4ceb3c..0a6cc6d 100644 --- a/llvm/unittests/TextAPI/TextStubV2Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV2Tests.cpp @@ -87,7 +87,6 @@ TEST(TBDv2, ReadFile) { EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint()); EXPECT_TRUE(File->isTwoLevelNamespace()); EXPECT_TRUE(File->isApplicationExtensionSafe()); - EXPECT_TRUE(File->isInstallAPI()); InterfaceFileRef client("clientA", Targets); InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Targets); EXPECT_EQ(1U, File->allowableClients().size()); @@ -159,7 +158,6 @@ TEST(TBDv2, ReadFile2) { EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint()); EXPECT_FALSE(File->isTwoLevelNamespace()); EXPECT_FALSE(File->isApplicationExtensionSafe()); - EXPECT_FALSE(File->isInstallAPI()); EXPECT_EQ(0U, File->allowableClients().size()); EXPECT_EQ(0U, File->reexportedLibraries().size()); } diff --git a/llvm/unittests/TextAPI/TextStubV3Tests.cpp b/llvm/unittests/TextAPI/TextStubV3Tests.cpp index 65b2f2d..8ae61f1 100644 --- a/llvm/unittests/TextAPI/TextStubV3Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV3Tests.cpp @@ -85,7 +85,6 @@ TEST(TBDv3, ReadFile) { "00000000-0000-0000-0000-000000000000"}, {Target(AK_arm64, PLATFORM_UNKNOWN), "11111111-1111-1111-1111-111111111111"}}; - EXPECT_EQ(Uuids, File->uuids()); EXPECT_EQ(File->getPlatforms().size(), 1U); EXPECT_EQ(Platform, *File->getPlatforms().begin()); EXPECT_EQ(std::string("Test.dylib"), File->getInstallName()); @@ -95,7 +94,6 @@ TEST(TBDv3, ReadFile) { EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint()); EXPECT_TRUE(File->isTwoLevelNamespace()); EXPECT_TRUE(File->isApplicationExtensionSafe()); - EXPECT_TRUE(File->isInstallAPI()); InterfaceFileRef client("clientA", Targets); InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Targets); EXPECT_EQ(1U, File->allowableClients().size()); @@ -122,8 +120,6 @@ TEST(TBDv3, ReadMultipleDocuments) { static const char TBDv3Inlines[] = "--- !tapi-tbd-v3\n" "archs: [ armv7, arm64 ]\n" - "uuids: [ 'armv7: 00000000-0000-0000-0000-000000000000',\n" - " 'arm64: 11111111-1111-1111-1111-111111111111']\n" "platform: ios\n" "install-name: Test.dylib\n" "current-version: 2.3.4\n" @@ -149,8 +145,6 @@ TEST(TBDv3, ReadMultipleDocuments) { " thread-local-symbols: [ _tlv3 ]\n" "--- !tapi-tbd-v3\n" "archs: [ armv7, arm64 ]\n" - "uuids: [ 'armv7: 00000000-0000-0000-0000-000000000000',\n" - " 'arm64: 11111111-1111-1111-1111-111111111111']\n" "platform: ios\n" "install-name: TestInline.dylib\n" "swift-abi-version: 1.1\n" @@ -175,7 +169,6 @@ TEST(TBDv3, ReadMultipleDocuments) { "00000000-0000-0000-0000-000000000000"}, {Target(AK_arm64, PLATFORM_UNKNOWN), "11111111-1111-1111-1111-111111111111"}}; - EXPECT_EQ(Uuids, File->uuids()); EXPECT_EQ(File->getPlatforms().size(), 1U); EXPECT_EQ(Platform, *File->getPlatforms().begin()); EXPECT_EQ(std::string("Test.dylib"), File->getInstallName()); @@ -185,7 +178,6 @@ TEST(TBDv3, ReadMultipleDocuments) { EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint()); EXPECT_TRUE(File->isTwoLevelNamespace()); EXPECT_TRUE(File->isApplicationExtensionSafe()); - EXPECT_FALSE(File->isInstallAPI()); InterfaceFileRef Client("clientA", Targets); const std::vector<InterfaceFileRef> Reexports = { InterfaceFileRef("/usr/lib/libfoo.dylib", Targets), @@ -214,7 +206,6 @@ TEST(TBDv3, ReadMultipleDocuments) { TBDReexportFile Document = File->documents().front(); EXPECT_EQ(FileType::TBD_V3, Document->getFileType()); EXPECT_EQ(Archs, Document->getArchitectures()); - EXPECT_EQ(Uuids, Document->uuids()); EXPECT_EQ(Platform, *Document->getPlatforms().begin()); EXPECT_EQ(std::string("TestInline.dylib"), Document->getInstallName()); EXPECT_EQ(PackedVersion(1, 0, 0), Document->getCurrentVersion()); @@ -919,8 +910,6 @@ TEST(TBDv3, InterfaceInequality) { EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) { File->setTwoLevelNamespace(false); })); - EXPECT_TRUE(checkEqualityOnTransform( - FileA, FileB, [](InterfaceFile *File) { File->setInstallAPI(true); })); EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) { File->setApplicationExtensionSafe(false); })); diff --git a/llvm/unittests/TextAPI/TextStubV4Tests.cpp b/llvm/unittests/TextAPI/TextStubV4Tests.cpp index f474641..6ad9925 100644 --- a/llvm/unittests/TextAPI/TextStubV4Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV4Tests.cpp @@ -90,11 +90,7 @@ TEST(TBDv4, ReadFile) { Target(AK_x86_64, PLATFORM_MACOS), Target(AK_x86_64, PLATFORM_IOS), }; - TargetToAttr uuids = {{Targets[0], "00000000-0000-0000-0000-000000000000"}, - {Targets[1], "11111111-1111-1111-1111-111111111111"}, - {Targets[2], "11111111-1111-1111-1111-111111111111"}}; EXPECT_EQ(Archs, File->getArchitectures()); - EXPECT_EQ(uuids, File->uuids()); EXPECT_EQ(Platforms.size(), File->getPlatforms().size()); for (auto Platform : File->getPlatforms()) EXPECT_EQ(Platforms.count(Platform), 1U); @@ -104,7 +100,6 @@ TEST(TBDv4, ReadFile) { EXPECT_EQ(5U, File->getSwiftABIVersion()); EXPECT_FALSE(File->isTwoLevelNamespace()); EXPECT_TRUE(File->isApplicationExtensionSafe()); - EXPECT_TRUE(File->isInstallAPI()); InterfaceFileRef client("ClientA", Targets); InterfaceFileRef reexport("/System/Library/Frameworks/A.framework/A", {Targets[0]}); @@ -169,15 +164,6 @@ TEST(TBDv4, ReadMultipleDocuments) { "tbd-version: 4\n" "targets: [ i386-macos, i386-maccatalyst, x86_64-macos, " "x86_64-maccatalyst ]\n" - "uuids:\n" - " - target: i386-macos\n" - " value: 00000000-0000-0000-0000-000000000000\n" - " - target: i386-maccatalyst\n" - " value: 00000000-0000-0000-0000-000000000002\n" - " - target: x86_64-macos\n" - " value: 11111111-1111-1111-1111-111111111111\n" - " - target: x86_64-maccatalyst\n" - " value: 11111111-1111-1111-1111-111111111112\n" "install-name: /System/Library/Frameworks/Umbrella.framework/Umbrella\n" "parent-umbrella:\n" " - targets: [ i386-macos, x86_64-macos ]\n" @@ -247,14 +233,12 @@ TEST(TBDv4, ReadMultipleDocuments) { TBDFile File = std::move(Result.get()); EXPECT_EQ(FileType::TBD_V4, File->getFileType()); EXPECT_EQ(Archs, File->getArchitectures()); - EXPECT_EQ(Uuids, File->uuids()); EXPECT_EQ(Platforms, File->getPlatforms()); EXPECT_EQ( std::string("/System/Library/Frameworks/Umbrella.framework/Umbrella"), File->getInstallName()); EXPECT_TRUE(File->isTwoLevelNamespace()); EXPECT_TRUE(File->isApplicationExtensionSafe()); - EXPECT_FALSE(File->isInstallAPI()); EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion()); EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion()); InterfaceFileRef reexport("/System/Library/Frameworks/A.framework/A", @@ -277,7 +261,6 @@ TEST(TBDv4, ReadMultipleDocuments) { TBDReexportFile Document = File->documents().front(); EXPECT_EQ(FileType::TBD_V4, Document->getFileType()); EXPECT_EQ(Archs, Document->getArchitectures()); - EXPECT_EQ(Uuids, Document->uuids()); EXPECT_EQ(1U, Document->getPlatforms().size()); EXPECT_EQ(Platform, *(Document->getPlatforms().begin())); EXPECT_EQ(std::string("/System/Library/Frameworks/A.framework/A"), @@ -287,7 +270,6 @@ TEST(TBDv4, ReadMultipleDocuments) { EXPECT_EQ(5U, Document->getSwiftABIVersion()); EXPECT_FALSE(Document->isTwoLevelNamespace()); EXPECT_TRUE(Document->isApplicationExtensionSafe()); - EXPECT_FALSE(Document->isInstallAPI()); ExportedSymbolSeq Exports; ExportedSymbolSeq Reexports, Undefineds; @@ -335,12 +317,6 @@ TEST(TBDv4, WriteFile) { "--- !tapi-tbd\n" "tbd-version: 4\n" "targets: [ i386-macos, x86_64-ios-simulator ]\n" - "uuids:\n" - " - target: i386-macos\n" - " value: 00000000-0000-0000-0000-000000000000\n" - " - target: x86_64-ios-simulator\n" - " value: 11111111-1111-1111-1111-111111111111\n" - "flags: [ installapi ]\n" "install-name: 'Umbrella.framework/Umbrella'\n" "current-version: 1.2.3\n" "compatibility-version: 0\n" @@ -365,16 +341,11 @@ TEST(TBDv4, WriteFile) { Target(AK_i386, PLATFORM_MACOS), Target(AK_x86_64, PLATFORM_IOSSIMULATOR), }; - TargetToAttr uuids = {{Targets[0], "00000000-0000-0000-0000-000000000000"}, - {Targets[1], "11111111-1111-1111-1111-111111111111"}}; File.setInstallName("Umbrella.framework/Umbrella"); File.setFileType(FileType::TBD_V4); File.addTargets(Targets); - File.addUUID(uuids[0].first, uuids[0].second); - File.addUUID(uuids[1].first, uuids[1].second); File.setCurrentVersion(PackedVersion(1, 2, 3)); File.setTwoLevelNamespace(); - File.setInstallAPI(true); File.setApplicationExtensionSafe(true); File.setSwiftABIVersion(5); File.addAllowableClient("ClientA", Targets[0]); @@ -398,11 +369,6 @@ TEST(TBDv4, WriteMultipleDocuments) { "--- !tapi-tbd\n" "tbd-version: 4\n" "targets: [ i386-maccatalyst, x86_64-maccatalyst ]\n" - "uuids:\n" - " - target: i386-maccatalyst\n" - " value: 00000000-0000-0000-0000-000000000002\n" - " - target: x86_64-maccatalyst\n" - " value: 11111111-1111-1111-1111-111111111112\n" "install-name: " "'/System/Library/Frameworks/Umbrella.framework/Umbrella'\n" "reexported-libraries:\n" @@ -411,11 +377,6 @@ TEST(TBDv4, WriteMultipleDocuments) { "--- !tapi-tbd\n" "tbd-version: 4\n" "targets: [ i386-maccatalyst, x86_64-maccatalyst ]\n" - "uuids:\n" - " - target: i386-maccatalyst\n" - " value: 00000000-0000-0000-0000-000000000000\n" - " - target: x86_64-maccatalyst\n" - " value: 11111111-1111-1111-1111-111111111111\n" "install-name: '/System/Library/Frameworks/A.framework/A'\n" "exports:\n" " - targets: [ i386-maccatalyst ]\n" @@ -438,8 +399,6 @@ TEST(TBDv4, WriteMultipleDocuments) { File.setInstallName("/System/Library/Frameworks/Umbrella.framework/Umbrella"); File.setFileType(FileType::TBD_V4); File.addTargets(Targets); - File.addUUID(Uuids[0].first, Uuids[0].second); - File.addUUID(Uuids[1].first, Uuids[1].second); File.setCompatibilityVersion(PackedVersion(1, 0, 0)); File.setCurrentVersion(PackedVersion(1, 0, 0)); File.setTwoLevelNamespace(); @@ -456,8 +415,6 @@ TEST(TBDv4, WriteMultipleDocuments) { Document.setInstallName("/System/Library/Frameworks/A.framework/A"); Document.setFileType(FileType::TBD_V4); Document.addTargets(Targets); - Document.addUUID(Uuids[0].first, Uuids[0].second); - Document.addUUID(Uuids[1].first, Uuids[1].second); Document.setCompatibilityVersion(PackedVersion(1, 0, 0)); Document.setCurrentVersion(PackedVersion(1, 0, 0)); Document.setTwoLevelNamespace(); @@ -948,18 +905,6 @@ TEST(TBDv4, InterfaceEquality) { "tbd-version: 4\n" "targets: [ i386-macos, x86_64-macos, x86_64-ios, i386-maccatalyst, " "x86_64-maccatalyst ]\n" - "uuids:\n" - " - target: i386-macos\n" - " value: 00000000-0000-0000-0000-000000000000\n" - " - target: x86_64-macos\n" - " value: 11111111-1111-1111-1111-111111111111\n" - " - target: x86_64-ios\n" - " value: 11111111-1111-1111-1111-111111111111\n" - " - target: i386-maccatalyst\n" - " value: 00000000-0000-0000-0000-000000000000\n" - " - target: x86_64-maccatalyst\n" - " value: 11111111-1111-1111-1111-111111111111\n" - "flags: [ flat_namespace, installapi ]\n" "install-name: Umbrella.framework/Umbrella\n" "current-version: 1.2.3\n" "compatibility-version: 1.2\n" @@ -1026,12 +971,6 @@ TEST(TBDv4, InterfaceDiffVersionsEquality) { "--- !tapi-tbd\n" "tbd-version: 4\n" "targets: [ i386-macos, x86_64-macos ]\n" - "uuids:\n" - " - target: i386-macos\n" - " value: 00000000-0000-0000-0000-000000000000\n" - " - target: x86_64-macos\n" - " value: 11111111-1111-1111-1111-111111111111\n" - "flags: [ installapi ]\n" "install-name: Umbrella.framework/Umbrella\n" "current-version: 1.2.3\n" "compatibility-version: 1.0\n" @@ -1074,10 +1013,7 @@ TEST(TBDv4, InterfaceDiffVersionsEquality) { static const char TBDv3File[] = "--- !tapi-tbd-v3\n" "archs: [ i386, x86_64 ]\n" - "uuids: [ 'i386: 00000000-0000-0000-0000-000000000000',\n" - " 'x86_64: 22222222-2222-2222-2222-222222222222']\n" "platform: macosx\n" - "flags: [ installapi ]\n" "install-name: Umbrella.framework/Umbrella\n" "current-version: 1.2.3\n" "compatibility-version: 1.0\n" @@ -1113,7 +1049,6 @@ TEST(TBDv4, InterfaceDiffVersionsEquality) { TextAPIReader::get(MemoryBufferRef(TBDv3File, "TestB.tbd")); EXPECT_TRUE(!!ResultB); InterfaceFile FileB = std::move(*ResultB.get()); - EXPECT_NE(FileA.uuids(), FileB.uuids()); EXPECT_TRUE(FileA == FileB); } @@ -1145,8 +1080,6 @@ TEST(TBDv4, InterfaceInequality) { EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) { File->setTwoLevelNamespace(false); })); - EXPECT_TRUE(checkEqualityOnTransform( - FileA, FileB, [](InterfaceFile *File) { File->setInstallAPI(true); })); EXPECT_TRUE(checkEqualityOnTransform(FileA, FileB, [](InterfaceFile *File) { File->setApplicationExtensionSafe(false); })); |