[TextAPI] Remove TBD file attributes that aren't used anymore.

cyndyishida · cyndyishida · commit 82c2a8296b80 · 2023-08-06T19:41:20.000-07:00
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 (cherry picked from commit a066695)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -211,9 +211,6 @@ std::vector<DiffOutput> getSingleIF(InterfaceFile *Interface,
   diffAttribute("Swift ABI Version", Output,
                 DiffScalarVal<uint8_t, AD_Diff_Scalar_Unsigned>(
                     Order, Interface->getSwiftABIVersion()));
-  diffAttribute("InstallAPI", Output,
-                DiffScalarVal<bool, AD_Diff_Scalar_Bool>(
-                    Order, Interface->isInstallAPI()));
   diffAttribute("Two Level Namespace", Output,
                 DiffScalarVal<bool, AD_Diff_Scalar_Bool>(
                     Order, Interface->isTwoLevelNamespace()));
@@ -348,11 +345,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
@@ -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
@@ -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
@@ -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
