[llvm] r348551 - [llvm-tapi] Don't override SequenceTraits for std::string
Armando Montanez via llvm-commits
llvm-commits at lists.llvm.org
Thu Dec 6 15:59:33 PST 2018
Author: amontanez
Date: Thu Dec 6 15:59:32 2018
New Revision: 348551
URL: http://llvm.org/viewvc/llvm-project?rev=348551&view=rev
Log:
[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
Modified:
llvm/trunk/lib/TextAPI/ELF/TBEHandler.cpp
Modified: llvm/trunk/lib/TextAPI/ELF/TBEHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/ELF/TBEHandler.cpp?rev=348551&r1=348550&r2=348551&view=diff
==============================================================================
--- llvm/trunk/lib/TextAPI/ELF/TBEHandler.cpp (original)
+++ llvm/trunk/lib/TextAPI/ELF/TBEHandler.cpp Thu Dec 6 15:59:32 2018
@@ -18,6 +18,8 @@ using namespace llvm;
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 @@ template <> struct CustomMappingTraits<s
}
};
-/// 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 @@ template <> struct MappingTraits<ELFStub
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);
}
};
More information about the llvm-commits
mailing list