diff --git a/llvm/include/llvm/TextAPI/InterfaceFile.h b/llvm/include/llvm/TextAPI/InterfaceFile.h --- a/llvm/include/llvm/TextAPI/InterfaceFile.h +++ b/llvm/include/llvm/TextAPI/InterfaceFile.h @@ -242,12 +242,6 @@ /// Get the Objective-C constraint. ObjCConstraintType getObjCConstraint() const { return ObjcConstraint; } - /// Specify if this file was generated during InstallAPI (or not). - void setInstallAPI(bool V = true) { IsInstallAPI = V; } - - /// Check if this file was generated during InstallAPI. - bool isInstallAPI() const { return IsInstallAPI; } - /// Set the parent umbrella frameworks. /// \param Target_ The target applicable to Parent /// \param Parent The name of Parent @@ -293,25 +287,6 @@ return ReexportedLibraries; } - /// Add an Target/UUID pair. - /// - /// \param Target The target triple for which this applies. - /// \param UUID The UUID of the library for the specified architecture. - void addUUID(const Target &Target, StringRef UUID); - - /// Add an Target/UUID pair. - /// - /// \param Target The target triple for which this applies. - /// \param UUID The UUID of the library for the specified architecture. - void addUUID(const Target &Target, uint8_t UUID[16]); - - /// Get the list of Target/UUID pairs. - /// - /// \return Returns a list of Target/UUID pairs. - const std::vector> &uuids() const { - return UUIDs; - } - /// Add a library for inlining to top level library. /// ///\param Document The library to inline with top level library. @@ -398,7 +373,7 @@ }; /// The equality is determined by attributes that impact linking - /// compatibilities. UUIDs, Path, & FileKind are irrelevant since these by + /// compatibilities. Path, & FileKind are irrelevant since these by /// itself should not impact linking. /// This is an expensive operation. bool operator==(const InterfaceFile &O) const; @@ -425,13 +400,11 @@ uint8_t SwiftABIVersion{0}; bool IsTwoLevelNamespace{false}; bool IsAppExtensionSafe{false}; - bool IsInstallAPI{false}; ObjCConstraintType ObjcConstraint = ObjCConstraintType::None; std::vector> ParentUmbrellas; std::vector AllowableClients; std::vector ReexportedLibraries; std::vector> Documents; - std::vector> UUIDs; std::vector> RPaths; std::unique_ptr SymbolsSet; InterfaceFile *Parent = nullptr; diff --git a/llvm/lib/TextAPI/InterfaceFile.cpp b/llvm/lib/TextAPI/InterfaceFile.cpp --- a/llvm/lib/TextAPI/InterfaceFile.cpp +++ b/llvm/lib/TextAPI/InterfaceFile.cpp @@ -59,30 +59,6 @@ RPaths.emplace(Iter, InputTarget, std::string(RPath)); } -void InterfaceFile::addUUID(const Target &Target_, StringRef UUID) { - auto Iter = lower_bound(UUIDs, Target_, - [](const std::pair &LHS, - Target RHS) { return LHS.first < RHS; }); - - if ((Iter != UUIDs.end()) && !(Target_ < Iter->first)) { - Iter->second = std::string(UUID); - return; - } - - UUIDs.emplace(Iter, Target_, std::string(UUID)); -} - -void InterfaceFile::addUUID(const Target &Target, uint8_t UUID[16]) { - std::stringstream Stream; - for (unsigned i = 0; i < 16; ++i) { - if (i == 4 || i == 6 || i == 8 || i == 10) - Stream << '-'; - Stream << std::setfill('0') << std::setw(2) << std::uppercase << std::hex - << static_cast(UUID[i]); - } - addUUID(Target, Stream.str()); -} - void InterfaceFile::addTarget(const Target &Target) { addEntry(Targets, Target); } @@ -123,8 +99,6 @@ return false; if (IsAppExtensionSafe != O.IsAppExtensionSafe) return false; - if (IsInstallAPI != O.IsInstallAPI) - return false; if (ParentUmbrellas != O.ParentUmbrellas) return false; if (AllowableClients != O.AllowableClients) diff --git a/llvm/lib/TextAPI/TextStub.cpp b/llvm/lib/TextAPI/TextStub.cpp --- a/llvm/lib/TextAPI/TextStub.cpp +++ b/llvm/lib/TextAPI/TextStub.cpp @@ -427,7 +427,6 @@ explicit NormalizedTBD(IO &IO) {} NormalizedTBD(IO &IO, const InterfaceFile *&File) { Architectures = File->getArchitectures(); - UUIDs = File->uuids(); Platforms = File->getPlatforms(); InstallName = File->getInstallName(); CurrentVersion = PackedVersion(File->getCurrentVersion()); @@ -442,9 +441,6 @@ if (!File->isTwoLevelNamespace()) Flags |= TBDFlags::FlatNamespace; - if (File->isInstallAPI()) - Flags |= TBDFlags::InstallAPI; - if (!File->umbrellas().empty()) ParentUmbrella = File->umbrellas().begin()->second; @@ -607,8 +603,6 @@ File->setPath(Ctx->Path); File->setFileType(Ctx->FileKind); File->addTargets(synthesizeTargets(Architectures, Platforms)); - for (auto &ID : UUIDs) - File->addUUID(ID.first, ID.second); File->setInstallName(InstallName); File->setCurrentVersion(CurrentVersion); File->setCompatibilityVersion(CompatibilityVersion); @@ -624,7 +618,6 @@ File->setTwoLevelNamespace(!(Flags & TBDFlags::FlatNamespace)); File->setApplicationExtensionSafe( !(Flags & TBDFlags::NotApplicationExtensionSafe)); - File->setInstallAPI(Flags & TBDFlags::InstallAPI); } for (const auto &Section : Exports) { @@ -797,8 +790,6 @@ TBDVersion = Ctx->FileKind >> 1; Targets.insert(Targets.begin(), File->targets().begin(), File->targets().end()); - for (const auto &IT : File->uuids()) - UUIDs.emplace_back(IT.first, IT.second); InstallName = File->getInstallName(); CurrentVersion = File->getCurrentVersion(); CompatibilityVersion = File->getCompatibilityVersion(); @@ -811,9 +802,6 @@ if (!File->isTwoLevelNamespace()) Flags |= TBDFlags::FlatNamespace; - if (File->isInstallAPI()) - Flags |= TBDFlags::InstallAPI; - { std::map valueToTargetList; for (const auto &it : File->umbrellas()) @@ -893,8 +881,6 @@ auto *File = new InterfaceFile; File->setPath(Ctx->Path); File->setFileType(Ctx->FileKind); - for (auto &id : UUIDs) - File->addUUID(id.TargetID, id.Value); File->addTargets(Targets); File->setInstallName(InstallName); File->setCurrentVersion(CurrentVersion); @@ -906,7 +892,6 @@ File->setTwoLevelNamespace(!(Flags & TBDFlags::FlatNamespace)); File->setApplicationExtensionSafe( !(Flags & TBDFlags::NotApplicationExtensionSafe)); - File->setInstallAPI(Flags & TBDFlags::InstallAPI); for (const auto &CurrentSection : AllowableClients) { for (const auto &lib : CurrentSection.Values) @@ -1007,9 +992,10 @@ static void mapKeysToValues(FileType FileKind, IO &IO, const InterfaceFile *&File) { MappingNormalization Keys(IO, File); + std::vector EmptyUUID; IO.mapRequired("archs", Keys->Architectures); if (FileKind != FileType::TBD_V1) - IO.mapOptional("uuids", Keys->UUIDs); + IO.mapOptional("uuids", EmptyUUID); IO.mapRequired("platform", Keys->Platforms); if (FileKind != FileType::TBD_V1) IO.mapOptional("flags", Keys->Flags, TBDFlags::None); @@ -1037,10 +1023,11 @@ static void mapKeysToValuesV4(IO &IO, const InterfaceFile *&File) { MappingNormalization Keys(IO, File); + std::vector EmptyUUID; IO.mapTag("!tapi-tbd", true); IO.mapRequired("tbd-version", Keys->TBDVersion); IO.mapRequired("targets", Keys->Targets); - IO.mapOptional("uuids", Keys->UUIDs); + IO.mapOptional("uuids", EmptyUUID); IO.mapOptional("flags", Keys->Flags, TBDFlags::None); IO.mapRequired("install-name", Keys->InstallName); IO.mapOptional("current-version", Keys->CurrentVersion, diff --git a/llvm/lib/TextAPI/TextStubCommon.h b/llvm/lib/TextAPI/TextStubCommon.h --- a/llvm/lib/TextAPI/TextStubCommon.h +++ b/llvm/lib/TextAPI/TextStubCommon.h @@ -90,6 +90,8 @@ static QuotingType mustQuote(StringRef); }; +// UUIDs are no longer respected but kept in the YAML parser +// to keep reading in older TBDs. template <> struct ScalarTraits { static void output(const UUID &, void *, raw_ostream &); static StringRef input(StringRef, void *, UUID &); diff --git a/llvm/lib/TextAPI/TextStubCommon.cpp b/llvm/lib/TextAPI/TextStubCommon.cpp --- a/llvm/lib/TextAPI/TextStubCommon.cpp +++ b/llvm/lib/TextAPI/TextStubCommon.cpp @@ -217,17 +217,10 @@ return QuotingType::None; } -void ScalarTraits::output(const UUID &Value, void *, raw_ostream &OS) { - OS << Value.first << ": " << Value.second; -} +void ScalarTraits::output(const UUID &Value, void *, raw_ostream &OS) {} + StringRef ScalarTraits::input(StringRef Scalar, void *, UUID &Value) { - auto Split = Scalar.split(':'); - auto Arch = Split.first.trim(); - auto UUID = Split.second.trim(); - if (UUID.empty()) - return "invalid uuid string pair"; - Value.second = std::string(UUID); - Value.first = Target{getArchitectureFromName(Arch), PLATFORM_UNKNOWN}; + Value = {}; return {}; } diff --git a/llvm/test/tools/llvm-tapi-diff/left-single-inline.test b/llvm/test/tools/llvm-tapi-diff/left-single-inline.test --- a/llvm/test/tools/llvm-tapi-diff/left-single-inline.test +++ b/llvm/test/tools/llvm-tapi-diff/left-single-inline.test @@ -45,8 +45,6 @@ ; CHECK-NEXT: > 0 ; CHECK-NEXT: Swift ABI Version ; CHECK-NEXT: > 5 -; CHECK-NEXT: InstallAPI -; CHECK-NEXT: > false ; CHECK-NEXT: Two Level Namespace ; CHECK-NEXT: > true ; CHECK-NEXT: Application Extension Safe diff --git a/llvm/test/tools/llvm-tapi-diff/mismatched-number-of-inlines.test b/llvm/test/tools/llvm-tapi-diff/mismatched-number-of-inlines.test --- a/llvm/test/tools/llvm-tapi-diff/mismatched-number-of-inlines.test +++ b/llvm/test/tools/llvm-tapi-diff/mismatched-number-of-inlines.test @@ -17,8 +17,6 @@ ; CHECK-NEXT: > 1.2 ; CHECK-NEXT: Swift ABI Version ; CHECK-NEXT: > 3 -; CHECK-NEXT: InstallAPI -; CHECK-NEXT: > false ; CHECK-NEXT: Two Level Namespace ; CHECK-NEXT: > true ; CHECK-NEXT: Application Extension Safe diff --git a/llvm/test/tools/llvm-tapi-diff/multiple-inlines.test b/llvm/test/tools/llvm-tapi-diff/multiple-inlines.test --- a/llvm/test/tools/llvm-tapi-diff/multiple-inlines.test +++ b/llvm/test/tools/llvm-tapi-diff/multiple-inlines.test @@ -49,8 +49,6 @@ ; CHECK-NEXT: > 0 ; CHECK-NEXT: Swift ABI Version ; CHECK-NEXT: > 5 -; CHECK-NEXT: InstallAPI -; CHECK-NEXT: > false ; CHECK-NEXT: Two Level Namespace ; CHECK-NEXT: > true ; CHECK-NEXT: Application Extension Safe @@ -77,8 +75,6 @@ ; CHECK-NEXT: > 1.2 ; CHECK-NEXT: Swift ABI Version ; CHECK-NEXT: > 3 -; CHECK-NEXT: InstallAPI -; CHECK-NEXT: > false ; CHECK-NEXT: Two Level Namespace ; CHECK-NEXT: > true ; CHECK-NEXT: Application Extension Safe diff --git a/llvm/test/tools/llvm-tapi-diff/right-single-inlines.test b/llvm/test/tools/llvm-tapi-diff/right-single-inlines.test --- a/llvm/test/tools/llvm-tapi-diff/right-single-inlines.test +++ b/llvm/test/tools/llvm-tapi-diff/right-single-inlines.test @@ -42,8 +42,6 @@ ; CHECK-NEXT: < 0 ; CHECK-NEXT: Swift ABI Version ; CHECK-NEXT: < 5 -; CHECK-NEXT: InstallAPI -; CHECK-NEXT: < false ; CHECK-NEXT: Two Level Namespace ; CHECK-NEXT: < true ; CHECK-NEXT: Application Extension Safe diff --git a/llvm/tools/llvm-tapi-diff/DiffEngine.cpp b/llvm/tools/llvm-tapi-diff/DiffEngine.cpp --- a/llvm/tools/llvm-tapi-diff/DiffEngine.cpp +++ b/llvm/tools/llvm-tapi-diff/DiffEngine.cpp @@ -212,9 +212,6 @@ diffAttribute("Swift ABI Version", Output, DiffScalarVal( Order, Interface->getSwiftABIVersion())); - diffAttribute("InstallAPI", Output, - DiffScalarVal( - Order, Interface->isInstallAPI())); diffAttribute("Two Level Namespace", Output, DiffScalarVal( Order, Interface->isTwoLevelNamespace())); @@ -349,11 +346,6 @@ DiffScalarVal( rhs, IFRHS->getSwiftABIVersion()), "Swift ABI Version")); - if (IFLHS->isInstallAPI() != IFRHS->isInstallAPI()) - Output.push_back(recordDifferences( - DiffScalarVal(lhs, IFLHS->isInstallAPI()), - DiffScalarVal(rhs, IFRHS->isInstallAPI()), - "InstallAPI")); if (IFLHS->isTwoLevelNamespace() != IFRHS->isTwoLevelNamespace()) Output.push_back(recordDifferences(DiffScalarVal( diff --git a/llvm/unittests/TextAPI/TextStubV1Tests.cpp b/llvm/unittests/TextAPI/TextStubV1Tests.cpp --- a/llvm/unittests/TextAPI/TextStubV1Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV1Tests.cpp @@ -86,7 +86,6 @@ 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 @@ 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 --- a/llvm/unittests/TextAPI/TextStubV2Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV2Tests.cpp @@ -87,7 +87,6 @@ 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 @@ 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 --- a/llvm/unittests/TextAPI/TextStubV3Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV3Tests.cpp @@ -85,7 +85,6 @@ "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 @@ 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 @@ 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 @@ " 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 @@ "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 @@ 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 Reexports = { InterfaceFileRef("/usr/lib/libfoo.dylib", Targets), @@ -214,7 +206,6 @@ 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 @@ 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 --- a/llvm/unittests/TextAPI/TextStubV4Tests.cpp +++ b/llvm/unittests/TextAPI/TextStubV4Tests.cpp @@ -90,11 +90,7 @@ 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 @@ 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 @@ "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 @@ 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 @@ 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 @@ 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 @@ "--- !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 @@ 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 @@ "--- !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 @@ "--- !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 @@ 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 @@ 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 @@ "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 @@ "--- !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 @@ 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 @@ 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 @@ 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); }));