[llvm] a066695 - [TextAPI] Remove TBD file attributes that aren't used anymore.
Cyndy Ishida via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 24 14:28:49 PDT 2023
Author: Cyndy Ishida
Date: 2023-07-24T14:26:32-07:00
New Revision: a0666956b2c701596a90891a21bb22937c7b7e50
URL: https://github.com/llvm/llvm-project/commit/a0666956b2c701596a90891a21bb22937c7b7e50
DIFF: https://github.com/llvm/llvm-project/commit/a0666956b2c701596a90891a21bb22937c7b7e50.diff
LOG: [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
Added:
Modified:
llvm/include/llvm/TextAPI/InterfaceFile.h
llvm/lib/TextAPI/InterfaceFile.cpp
llvm/lib/TextAPI/TextStub.cpp
llvm/lib/TextAPI/TextStubCommon.cpp
llvm/lib/TextAPI/TextStubCommon.h
llvm/test/tools/llvm-tapi-diff/left-single-inline.test
llvm/test/tools/llvm-tapi-diff/mismatched-number-of-inlines.test
llvm/test/tools/llvm-tapi-diff/multiple-inlines.test
llvm/test/tools/llvm-tapi-diff/right-single-inlines.test
llvm/tools/llvm-tapi-diff/DiffEngine.cpp
llvm/unittests/TextAPI/TextStubV1Tests.cpp
llvm/unittests/TextAPI/TextStubV2Tests.cpp
llvm/unittests/TextAPI/TextStubV3Tests.cpp
llvm/unittests/TextAPI/TextStubV4Tests.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/TextAPI/InterfaceFile.h b/llvm/include/llvm/TextAPI/InterfaceFile.h
index 7b0cd6109a2f158..2f89605d24baec0 100644
--- a/llvm/include/llvm/TextAPI/InterfaceFile.h
+++ b/llvm/include/llvm/TextAPI/InterfaceFile.h
@@ -242,12 +242,6 @@ class InterfaceFile {
/// 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 @@ class InterfaceFile {
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<std::pair<Target, std::string>> &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 @@ class InterfaceFile {
};
/// 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 @@ class InterfaceFile {
uint8_t SwiftABIVersion{0};
bool IsTwoLevelNamespace{false};
bool IsAppExtensionSafe{false};
- bool IsInstallAPI{false};
ObjCConstraintType ObjcConstraint = ObjCConstraintType::None;
std::vector<std::pair<Target, std::string>> ParentUmbrellas;
std::vector<InterfaceFileRef> AllowableClients;
std::vector<InterfaceFileRef> ReexportedLibraries;
std::vector<std::shared_ptr<InterfaceFile>> Documents;
- std::vector<std::pair<Target, std::string>> UUIDs;
std::vector<std::pair<Target, std::string>> RPaths;
std::unique_ptr<SymbolSet> SymbolsSet;
InterfaceFile *Parent = nullptr;
diff --git a/llvm/lib/TextAPI/InterfaceFile.cpp b/llvm/lib/TextAPI/InterfaceFile.cpp
index bb98c92f71782b4..b7f967aa754e78f 100644
--- a/llvm/lib/TextAPI/InterfaceFile.cpp
+++ b/llvm/lib/TextAPI/InterfaceFile.cpp
@@ -59,30 +59,6 @@ void InterfaceFile::addRPath(const Target &InputTarget, StringRef RPath) {
RPaths.emplace(Iter, InputTarget, std::string(RPath));
}
-void InterfaceFile::addUUID(const Target &Target_, StringRef UUID) {
- auto Iter = lower_bound(UUIDs, Target_,
- [](const std::pair<Target, std::string> &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<int>(UUID[i]);
- }
- addUUID(Target, Stream.str());
-}
-
void InterfaceFile::addTarget(const Target &Target) {
addEntry(Targets, Target);
}
@@ -123,8 +99,6 @@ bool InterfaceFile::operator==(const InterfaceFile &O) const {
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
index 7c1bfd2b1878eec..78de3ebf3f3a591 100644
--- a/llvm/lib/TextAPI/TextStub.cpp
+++ b/llvm/lib/TextAPI/TextStub.cpp
@@ -427,7 +427,6 @@ template <> struct MappingTraits<const InterfaceFile *> {
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 @@ template <> struct MappingTraits<const InterfaceFile *> {
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 @@ template <> struct MappingTraits<const InterfaceFile *> {
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 @@ template <> struct MappingTraits<const InterfaceFile *> {
File->setTwoLevelNamespace(!(Flags & TBDFlags::FlatNamespace));
File->setApplicationExtensionSafe(
!(Flags & TBDFlags::NotApplicationExtensionSafe));
- File->setInstallAPI(Flags & TBDFlags::InstallAPI);
}
for (const auto &Section : Exports) {
@@ -797,8 +790,6 @@ template <> struct MappingTraits<const InterfaceFile *> {
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 @@ template <> struct MappingTraits<const InterfaceFile *> {
if (!File->isTwoLevelNamespace())
Flags |= TBDFlags::FlatNamespace;
- if (File->isInstallAPI())
- Flags |= TBDFlags::InstallAPI;
-
{
std::map<std::string, TargetList> valueToTargetList;
for (const auto &it : File->umbrellas())
@@ -893,8 +881,6 @@ template <> struct MappingTraits<const InterfaceFile *> {
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 @@ template <> struct MappingTraits<const InterfaceFile *> {
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 @@ template <> struct MappingTraits<const InterfaceFile *> {
static void mapKeysToValues(FileType FileKind, IO &IO,
const InterfaceFile *&File) {
MappingNormalization<NormalizedTBD, const InterfaceFile *> Keys(IO, File);
+ std::vector<UUID> 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 @@ template <> struct MappingTraits<const InterfaceFile *> {
static void mapKeysToValuesV4(IO &IO, const InterfaceFile *&File) {
MappingNormalization<NormalizedTBD_V4, const InterfaceFile *> Keys(IO,
File);
+ std::vector<UUIDv4> 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.cpp b/llvm/lib/TextAPI/TextStubCommon.cpp
index f865b8391fdb4b6..0b710b0790b3db3 100644
--- a/llvm/lib/TextAPI/TextStubCommon.cpp
+++ b/llvm/lib/TextAPI/TextStubCommon.cpp
@@ -217,17 +217,10 @@ QuotingType ScalarTraits<SwiftVersion>::mustQuote(StringRef) {
return QuotingType::None;
}
-void ScalarTraits<UUID>::output(const UUID &Value, void *, raw_ostream &OS) {
- OS << Value.first << ": " << Value.second;
-}
+void ScalarTraits<UUID>::output(const UUID &Value, void *, raw_ostream &OS) {}
+
StringRef ScalarTraits<UUID>::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/lib/TextAPI/TextStubCommon.h b/llvm/lib/TextAPI/TextStubCommon.h
index 9558bd9e2d352d9..d4dcd3af447a6a4 100644
--- a/llvm/lib/TextAPI/TextStubCommon.h
+++ b/llvm/lib/TextAPI/TextStubCommon.h
@@ -90,6 +90,8 @@ template <> struct ScalarTraits<SwiftVersion> {
static QuotingType mustQuote(StringRef);
};
+// UUIDs are no longer respected but kept in the YAML parser
+// to keep reading in older TBDs.
template <> struct ScalarTraits<UUID> {
static void output(const UUID &, void *, raw_ostream &);
static StringRef input(StringRef, void *, UUID &);
diff --git a/llvm/test/tools/llvm-tapi-
diff /left-single-inline.test b/llvm/test/tools/llvm-tapi-
diff /left-single-inline.test
index 9e1b8b754360d84..0c507c3ca598aa1 100644
--- 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
index 3835bdaf1fb7445..9f1db68cb43d3f3 100644
--- 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
index 34fbb08dda706b9..45d4f0367ab67ff 100644
--- 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
index 4f5da809e30fd9a..cfed2e75c1ee62a 100644
--- 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
index 95bc137f1bd9043..3e07bb94f4df55a 100644
--- a/llvm/tools/llvm-tapi-
diff /DiffEngine.cpp
+++ b/llvm/tools/llvm-tapi-
diff /DiffEngine.cpp
@@ -212,9 +212,6 @@ std::vector<DiffOutput> getSingleIF(InterfaceFile *Interface,
diff Attribute("Swift ABI Version", Output,
DiffScalarVal<uint8_t, AD_Diff_Scalar_Unsigned>(
Order, Interface->getSwiftABIVersion()));
-
diff Attribute("InstallAPI", Output,
- DiffScalarVal<bool, AD_Diff_Scalar_Bool>(
- Order, Interface->isInstallAPI()));
diff Attribute("Two Level Namespace", Output,
DiffScalarVal<bool, AD_Diff_Scalar_Bool>(
Order, Interface->isTwoLevelNamespace()));
@@ -349,11 +346,6 @@ DiffEngine::findDifferences(const InterfaceFile *IFLHS,
DiffScalarVal<uint8_t, AD_Diff_Scalar_Unsigned>(
rhs, IFRHS->getSwiftABIVersion()),
"Swift ABI Version"));
- if (IFLHS->isInstallAPI() != IFRHS->isInstallAPI())
- Output.push_back(recordDifferences(
- DiffScalarVal<bool, AD_Diff_Scalar_Bool>(lhs, IFLHS->isInstallAPI()),
- DiffScalarVal<bool, AD_Diff_Scalar_Bool>(rhs, IFRHS->isInstallAPI()),
- "InstallAPI"));
if (IFLHS->isTwoLevelNamespace() != IFRHS->isTwoLevelNamespace())
Output.push_back(recordDifferences(DiffScalarVal<bool, AD_Diff_Scalar_Bool>(
diff --git a/llvm/unittests/TextAPI/TextStubV1Tests.cpp b/llvm/unittests/TextAPI/TextStubV1Tests.cpp
index e2c6cd204e1ecfd..2ef30b331bbb0dd 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 a4ceb3c2a8b7a4a..0a6cc6df36a52be 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 65b2f2d1e0b884d..8ae61f18cf2b521 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 f4746418df0afca..6ad9925f7fc5d54 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);
}));
More information about the llvm-commits
mailing list