[llvm] r347827 - [TextAPI] TBD Reader/Writer (bot fixes: take 2)
Juergen Ributzka via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 28 18:28:58 PST 2018
Author: ributzka
Date: Wed Nov 28 18:28:58 2018
New Revision: 347827
URL: http://llvm.org/viewvc/llvm-project?rev=347827&view=rev
Log:
[TextAPI] TBD Reader/Writer (bot fixes: take 2)
Replace the tuple with a struct to work around an explicit constructor bug.
Modified:
llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp
llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp
Modified: llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp?rev=347827&r1=347826&r2=347827&view=diff
==============================================================================
--- llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp (original)
+++ llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp Wed Nov 28 18:28:58 2018
@@ -16,11 +16,21 @@
using namespace llvm;
using namespace llvm::MachO;
-using ExportedSymbol = std::tuple<SymbolKind, std::string, bool, bool>;
+struct ExportedSymbol {
+ SymbolKind Kind;
+ std::string Name;
+ bool WeakDefined;
+ bool ThreadLocalValue;
+};
using ExportedSymbolSeq = std::vector<ExportedSymbol>;
inline bool operator<(const ExportedSymbol &lhs, const ExportedSymbol &rhs) {
- return std::get<1>(lhs) < std::get<1>(rhs);
+ return std::tie(lhs.Kind, lhs.Name) < std::tie(rhs.Kind, rhs.Name);
+}
+
+inline bool operator==(const ExportedSymbol &lhs, const ExportedSymbol &rhs) {
+ return std::tie(lhs.Kind, lhs.Name, lhs.WeakDefined, lhs.ThreadLocalValue) ==
+ std::tie(rhs.Kind, rhs.Name, rhs.WeakDefined, rhs.ThreadLocalValue);
}
static ExportedSymbol TBDv1Symbols[] = {
@@ -100,8 +110,9 @@ TEST(TBDv1, ReadFile) {
for (const auto *Sym : File->symbols()) {
EXPECT_FALSE(Sym->isWeakReferenced());
EXPECT_FALSE(Sym->isUndefined());
- Exports.emplace_back(Sym->getKind(), Sym->getName(), Sym->isWeakDefined(),
- Sym->isThreadLocalValue());
+ Exports.emplace_back(ExportedSymbol{Sym->getKind(), Sym->getName(),
+ Sym->isWeakDefined(),
+ Sym->isThreadLocalValue()});
}
llvm::sort(Exports.begin(), Exports.end());
Modified: llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp?rev=347827&r1=347826&r2=347827&view=diff
==============================================================================
--- llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp (original)
+++ llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp Wed Nov 28 18:28:58 2018
@@ -16,11 +16,21 @@
using namespace llvm;
using namespace llvm::MachO;
-using ExportedSymbol = std::tuple<SymbolKind, std::string, bool, bool>;
+struct ExportedSymbol {
+ SymbolKind Kind;
+ std::string Name;
+ bool WeakDefined;
+ bool ThreadLocalValue;
+};
using ExportedSymbolSeq = std::vector<ExportedSymbol>;
inline bool operator<(const ExportedSymbol &lhs, const ExportedSymbol &rhs) {
- return std::get<1>(lhs) < std::get<1>(rhs);
+ return std::tie(lhs.Kind, lhs.Name) < std::tie(rhs.Kind, rhs.Name);
+}
+
+inline bool operator==(const ExportedSymbol &lhs, const ExportedSymbol &rhs) {
+ return std::tie(lhs.Kind, lhs.Name, lhs.WeakDefined, lhs.ThreadLocalValue) ==
+ std::tie(rhs.Kind, rhs.Name, rhs.WeakDefined, rhs.ThreadLocalValue);
}
static ExportedSymbol TBDv2Symbols[] = {
@@ -102,8 +112,9 @@ TEST(TBDv2, ReadFile) {
for (const auto *Sym : File->symbols()) {
EXPECT_FALSE(Sym->isWeakReferenced());
EXPECT_FALSE(Sym->isUndefined());
- Exports.emplace_back(Sym->getKind(), Sym->getName(), Sym->isWeakDefined(),
- Sym->isThreadLocalValue());
+ Exports.emplace_back(ExportedSymbol{Sym->getKind(), Sym->getName(),
+ Sym->isWeakDefined(),
+ Sym->isThreadLocalValue()});
}
llvm::sort(Exports.begin(), Exports.end());
More information about the llvm-commits
mailing list