commit 1b057a4f98390f8b53218cb8f0e2b49acbcd4581
author Armando Montanez <amontanez@google.com> Thu Dec 06 23:59:32 2018 +0000
committer Armando Montanez <amontanez@google.com> Thu Dec 06 23:59:32 2018 +0000
tree 8a1272c446ef06dfc94ecbc8391d31863f522585
parent 2404506e324d2c0be3a23ef585e12d54c4844eeb

[llvm-tapi] Don't override SequenceTraits for std::string

Change the ELF YAML implementation of TextAPI so NeededLibs uses flow
sequence vector correctly instead of overriding the YAML implementation
for std::vector<std::string>>.

This should fix the test failure with the LLVM_LINK_LLVM_DYLIB build mentioned in D55381.

Still passes existing tests that cover this.

Differential Revision: https://reviews.llvm.org/D55390

llvm/lib/TextAPI/ELF/TBEHandler.cpp

diff --git a/llvm/lib/TextAPI/ELF/TBEHandler.cpp b/llvm/lib/TextAPI/ELF/TBEHandler.cpp
index a321666..59c61c3 100644
--- a/llvm/lib/TextAPI/ELF/TBEHandler.cpp
+++ b/llvm/lib/TextAPI/ELF/TBEHandler.cpp
@@ -18,6 +18,8 @@
 using namespace llvm::elfabi;
 
 LLVM_YAML_STRONG_TYPEDEF(ELFArch, ELFArchMapper)
+LLVM_YAML_STRONG_TYPEDEF(std::string, ELFNeededEntry)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(ELFNeededEntry)
 
 namespace llvm {
 namespace yaml {
@@ -126,21 +128,23 @@
   }
 };
 
-/// YAML traits for generic string vectors (i.e. list of needed libraries).
-template <> struct SequenceTraits<std::vector<std::string>> {
-  static size_t size(IO &IO, std::vector<std::string> &List) {
-    return List.size();
+/// YAML traits for ELFNeededEntry. This is required to enable flow mapping on
+/// NeededLibs.
+template <> struct ScalarTraits<ELFNeededEntry> {
+  static void output(const ELFNeededEntry &Value, void *,
+                     llvm::raw_ostream &Out) {
+    Out << Value.value;
   }
 
-  static std::string &element(IO &IO, std::vector<std::string> &List,
-                              size_t Index) {
-    if (Index >= List.size())
-      List.resize(Index + 1);
-    return List[Index];
+  static StringRef input(StringRef Scalar, void *, ELFNeededEntry &Value) {
+    Value = Scalar.str();
+
+    // Returning empty StringRef indicates successful parse.
+    return StringRef();
   }
 
-  // Compacts list of needed libraries into a single line.
-  static const bool flow = true;
+  // Don't place quotation marks around needed entries.
+  static QuotingType mustQuote(StringRef) { return QuotingType::None; }
 };
 
 /// YAML traits for ELFStub objects.
@@ -151,7 +155,8 @@
     IO.mapRequired("TbeVersion", Stub.TbeVersion);
     IO.mapRequired("SoName", Stub.SoName);
     IO.mapRequired("Arch", (ELFArchMapper &)Stub.Arch);
-    IO.mapOptional("NeededLibs", Stub.NeededLibs);
+    IO.mapOptional("NeededLibs",
+                   (std::vector<ELFNeededEntry> &)Stub.NeededLibs);
     IO.mapRequired("Symbols", Stub.Symbols);
   }
 };