[llvm] r277888 - Resubmit "Make YAML support SmallVector"
Zachary Turner via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 5 16:12:32 PDT 2016
Author: zturner
Date: Fri Aug 5 18:12:31 2016
New Revision: 277888
URL: http://llvm.org/viewvc/llvm-project?rev=277888&view=rev
Log:
Resubmit "Make YAML support SmallVector"
This resubmits a3770391c5fb64108d565e12f61dd77ce71b5b4f,
which was reverted due to breakages on non-Windows machines.
Due to differences in template instantiation rules on Microsoft
and non-Microsoft platforms, a member access restriction was
triggering on non-Microsoft compilers. Previously, a friend
declaration for std::vector<> had been introduced into the
DebugMap class to make the member access restriction pass,
but the introduction of support for SmallVector<> meant that
an additional friend declaration would need to be added.
This didn't really make a lot of sense since the user of the
macro is probably only using one type (SmallVector<>, vector<>,
etc) and we could in theory add support for even more types
to this macro in the future (e.g. std::deque), so rather than
add another friend declaration, I just made the type being
referenced a public nested typedef instead of a private nested
typedef.
Modified:
llvm/trunk/include/llvm/Support/YAMLTraits.h
llvm/trunk/tools/dsymutil/DebugMap.h
Modified: llvm/trunk/include/llvm/Support/YAMLTraits.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/YAMLTraits.h?rev=277888&r1=277887&r2=277888&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/YAMLTraits.h (original)
+++ llvm/trunk/include/llvm/Support/YAMLTraits.h Fri Aug 5 18:12:31 2016
@@ -1359,66 +1359,63 @@ operator<<(Output &yout, T &seq) {
return yout;
}
+template <typename T> struct SequenceTraitsImpl {
+ typedef typename T::value_type _type;
+ static size_t size(IO &io, T &seq) { return seq.size(); }
+ static _type &element(IO &io, T &seq, size_t index) {
+ if (index >= seq.size())
+ seq.resize(index + 1);
+ return seq[index];
+ }
+};
+
} // namespace yaml
} // namespace llvm
/// Utility for declaring that a std::vector of a particular type
/// should be considered a YAML sequence.
-#define LLVM_YAML_IS_SEQUENCE_VECTOR(_type) \
- namespace llvm { \
- namespace yaml { \
- template<> \
- struct SequenceTraits< std::vector<_type> > { \
- static size_t size(IO &io, std::vector<_type> &seq) { \
- return seq.size(); \
- } \
- static _type& element(IO &io, std::vector<_type> &seq, size_t index) {\
- if ( index >= seq.size() ) \
- seq.resize(index+1); \
- return seq[index]; \
- } \
- }; \
- } \
+#define LLVM_YAML_IS_SEQUENCE_VECTOR(_type) \
+ namespace llvm { \
+ namespace yaml { \
+ template <> \
+ struct SequenceTraits<std::vector<_type>> \
+ : public SequenceTraitsImpl<std::vector<_type>> {}; \
+ template <unsigned N> \
+ struct SequenceTraits<SmallVector<_type, N>> \
+ : public SequenceTraitsImpl<SmallVector<_type, N>> {}; \
+ } \
}
/// Utility for declaring that a std::vector of a particular type
/// should be considered a YAML flow sequence.
-#define LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(_type) \
- namespace llvm { \
- namespace yaml { \
- template<> \
- struct SequenceTraits< std::vector<_type> > { \
- static size_t size(IO &io, std::vector<_type> &seq) { \
- return seq.size(); \
- } \
- static _type& element(IO &io, std::vector<_type> &seq, size_t index) {\
- (void)flow; /* Remove this workaround after PR17897 is fixed */ \
- if ( index >= seq.size() ) \
- seq.resize(index+1); \
- return seq[index]; \
- } \
- static const bool flow = true; \
- }; \
- } \
+#define LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(_type) \
+ namespace llvm { \
+ namespace yaml { \
+ template <unsigned N> \
+ struct SequenceTraits<SmallVector<_type, N>> \
+ : public SequenceTraitsImpl<SmallVector<_type, N>> { \
+ static const bool flow = true; \
+ }; \
+ template <> \
+ struct SequenceTraits<std::vector<_type>> \
+ : public SequenceTraitsImpl<std::vector<_type>> { \
+ static const bool flow = true; \
+ }; \
+ } \
}
/// Utility for declaring that a std::vector of a particular type
/// should be considered a YAML document list.
-#define LLVM_YAML_IS_DOCUMENT_LIST_VECTOR(_type) \
- namespace llvm { \
- namespace yaml { \
- template<> \
- struct DocumentListTraits< std::vector<_type> > { \
- static size_t size(IO &io, std::vector<_type> &seq) { \
- return seq.size(); \
- } \
- static _type& element(IO &io, std::vector<_type> &seq, size_t index) {\
- if ( index >= seq.size() ) \
- seq.resize(index+1); \
- return seq[index]; \
- } \
- }; \
- } \
+#define LLVM_YAML_IS_DOCUMENT_LIST_VECTOR(_type) \
+ namespace llvm { \
+ namespace yaml { \
+ template <unsigned N> \
+ struct DocumentListTraits<SmallVector<_type, N>> \
+ : public SequenceTraitsImpl<SmallVector<_type, N>> {}; \
+ template <> \
+ struct DocumentListTraits<std::vector<_type>> \
+ : public SequenceTraitsImpl<std::vector<_type>> {}; \
+ } \
}
#endif // LLVM_SUPPORT_YAMLTRAITS_H
Modified: llvm/trunk/tools/dsymutil/DebugMap.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DebugMap.h?rev=277888&r1=277887&r2=277888&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DebugMap.h (original)
+++ llvm/trunk/tools/dsymutil/DebugMap.h Fri Aug 5 18:12:31 2016
@@ -130,6 +130,7 @@ public:
SymbolMapping() = default;
};
+ typedef std::pair<std::string, SymbolMapping> YAMLSymbolMapping;
typedef StringMapEntry<SymbolMapping> DebugMapEntry;
/// \brief Adds a symbol mapping to this DebugMapObject.
@@ -170,10 +171,8 @@ private:
/// For YAMLIO support.
///@{
- typedef std::pair<std::string, SymbolMapping> YAMLSymbolMapping;
friend yaml::MappingTraits<dsymutil::DebugMapObject>;
friend yaml::SequenceTraits<std::vector<std::unique_ptr<DebugMapObject>>>;
- friend yaml::SequenceTraits<std::vector<YAMLSymbolMapping>>;
DebugMapObject() = default;
public:
More information about the llvm-commits
mailing list