This is an archive of the discontinued LLVM Phabricator instance.

Differential D75096

[ASTMatchers] Matcher macros with params move params instead of copying
ClosedPublic

Authored by njames93 on Feb 24 2020, 6:09 PM.

Details

Reviewers
aaron.ballman
gribozavr2
Commits
rG3e9a7b2ba470: [ASTMatchers] Matcher macros with params move params instead of copying
Summary

Use move semantics instead of copying for AST Matchers with parameters

Diff Detail

Event Timeline

njames93 created this revision.Feb 24 2020, 6:09 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 24 2020, 6:09 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B47177: Diff 246355.Feb 24 2020, 7:37 PM
gribozavr2 accepted this revision.Feb 24 2020, 11:23 PM
This revision is now accepted and ready to land.Feb 24 2020, 11:23 PM
Closed by commit rG3e9a7b2ba470: [ASTMatchers] Matcher macros with params move params instead of copying (authored by njames93). · Explain WhyFeb 24 2020, 11:56 PM
This revision was automatically updated to reflect the committed changes.
hans added a reverting change: rG0ce32a79825f: Revert "[ASTMatchers] Matcher macros with params move params instead of copying".Nov 27 2020, 5:51 AM

Revision Contents

PathSize
clang/
include/
clang/
ASTMatchers/
58 lines

Diff 246355

clang/include/clang/ASTMatchers/ASTMatchersMacros.h

Show First 20 Lines • Show All 128 Lines • ▼ Show 20 Lines#define AST_MATCHER_P(Type, DefineMatcher, ParamType, Param) \
AST_MATCHER_P_OVERLOAD(Type, DefineMatcher, ParamType, Param, 0) AST_MATCHER_P_OVERLOAD(Type, DefineMatcher, ParamType, Param, 0)
#define AST_MATCHER_P_OVERLOAD(Type, DefineMatcher, ParamType, Param, \ #define AST_MATCHER_P_OVERLOAD(Type, DefineMatcher, ParamType, Param, \
OverloadId) \ OverloadId) \
namespace internal { \ namespace internal { \
class matcher_##DefineMatcher##OverloadId##Matcher \ class matcher_##DefineMatcher##OverloadId##Matcher \
: public ::clang::ast_matchers::internal::MatcherInterface<Type> { \ : public ::clang::ast_matchers::internal::MatcherInterface<Type> { \
public: \ public: \
explicit matcher_##DefineMatcher##OverloadId##Matcher( \ explicit matcher_##DefineMatcher##OverloadId##Matcher(ParamType A##Param) \
ParamType const &A##Param) \ : Param(std::move(A##Param)) {} \
: Param(A##Param) {} \
bool matches(const Type &Node, \ bool matches(const Type &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder \ ::clang::ast_matchers::internal::BoundNodesTreeBuilder \
*Builder) const override; \ *Builder) const override; \
\ \
private: \ private: \
ParamType const Param; \ ParamType const Param; \
}; \ }; \
} \ } \
inline ::clang::ast_matchers::internal::Matcher<Type> DefineMatcher( \ inline ::clang::ast_matchers::internal::Matcher<Type> DefineMatcher( \
ParamType const &Param) { \ ParamType Param) { \
return ::clang::ast_matchers::internal::makeMatcher( \ return ::clang::ast_matchers::internal::makeMatcher( \
new internal::matcher_##DefineMatcher##OverloadId##Matcher(Param)); \ new internal::matcher_##DefineMatcher##OverloadId##Matcher( \
std::move(Param))); \
} \ } \
typedef ::clang::ast_matchers::internal::Matcher<Type>( \ typedef ::clang::ast_matchers::internal::Matcher<Type> ( \
&DefineMatcher##_Type##OverloadId)(ParamType const &Param); \ &DefineMatcher##_Type##OverloadId)(ParamType Param); \
inline bool internal::matcher_##DefineMatcher##OverloadId##Matcher::matches( \ inline bool internal::matcher_##DefineMatcher##OverloadId##Matcher::matches( \
const Type &Node, \ const Type &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) const ::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) const
/// AST_MATCHER_P2( /// AST_MATCHER_P2(
/// Type, DefineMatcher, ParamType1, Param1, ParamType2, Param2) { ... } /// Type, DefineMatcher, ParamType1, Param1, ParamType2, Param2) { ... }
/// defines a two-parameter function named DefineMatcher() that returns a /// defines a two-parameter function named DefineMatcher() that returns a
Show All 14 Lines AST_MATCHER_P2_OVERLOAD(Type, DefineMatcher, ParamType1, Param1, ParamType2, \
Param2, 0) Param2, 0)
#define AST_MATCHER_P2_OVERLOAD(Type, DefineMatcher, ParamType1, Param1, \ #define AST_MATCHER_P2_OVERLOAD(Type, DefineMatcher, ParamType1, Param1, \
ParamType2, Param2, OverloadId) \ ParamType2, Param2, OverloadId) \
namespace internal { \ namespace internal { \
class matcher_##DefineMatcher##OverloadId##Matcher \ class matcher_##DefineMatcher##OverloadId##Matcher \
: public ::clang::ast_matchers::internal::MatcherInterface<Type> { \ : public ::clang::ast_matchers::internal::MatcherInterface<Type> { \
public: \ public: \
matcher_##DefineMatcher##OverloadId##Matcher(ParamType1 const &A##Param1, \ matcher_##DefineMatcher##OverloadId##Matcher(ParamType1 A##Param1, \
ParamType2 const &A##Param2) \ ParamType2 A##Param2) \
: Param1(A##Param1), Param2(A##Param2) {} \ : Param1(std::move(A##Param1)), Param2(std::move(A##Param2)) {} \
bool matches(const Type &Node, \ bool matches(const Type &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder \ ::clang::ast_matchers::internal::BoundNodesTreeBuilder \
*Builder) const override; \ *Builder) const override; \
\ \
private: \ private: \
ParamType1 const Param1; \ ParamType1 const Param1; \
ParamType2 const Param2; \ ParamType2 const Param2; \
}; \ }; \
} \ } \
inline ::clang::ast_matchers::internal::Matcher<Type> DefineMatcher( \ inline ::clang::ast_matchers::internal::Matcher<Type> DefineMatcher( \
ParamType1 const &Param1, ParamType2 const &Param2) { \ ParamType1 Param1, ParamType2 Param2) { \
return ::clang::ast_matchers::internal::makeMatcher( \ return ::clang::ast_matchers::internal::makeMatcher( \
new internal::matcher_##DefineMatcher##OverloadId##Matcher(Param1, \ new internal::matcher_##DefineMatcher##OverloadId##Matcher( \
Param2)); \ std::move(Param1), std::move(Param2))); \
} \ } \
typedef ::clang::ast_matchers::internal::Matcher<Type>( \ typedef ::clang::ast_matchers::internal::Matcher<Type> ( \
&DefineMatcher##_Type##OverloadId)(ParamType1 const &Param1, \ &DefineMatcher##_Type##OverloadId)(ParamType1 Param1, \
ParamType2 const &Param2); \ ParamType2 Param2); \
inline bool internal::matcher_##DefineMatcher##OverloadId##Matcher::matches( \ inline bool internal::matcher_##DefineMatcher##OverloadId##Matcher::matches( \
const Type &Node, \ const Type &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) const ::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) const
/// Construct a type-list to be passed to the AST_POLYMORPHIC_MATCHER* /// Construct a type-list to be passed to the AST_POLYMORPHIC_MATCHER*
/// macros. /// macros.
/// ///
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines
#define AST_POLYMORPHIC_MATCHER_P_OVERLOAD(DefineMatcher, ReturnTypesF, \ #define AST_POLYMORPHIC_MATCHER_P_OVERLOAD(DefineMatcher, ReturnTypesF, \
ParamType, Param, OverloadId) \ ParamType, Param, OverloadId) \
namespace internal { \ namespace internal { \
template <typename NodeType, typename ParamT> \ template <typename NodeType, typename ParamT> \
class matcher_##DefineMatcher##OverloadId##Matcher \ class matcher_##DefineMatcher##OverloadId##Matcher \
: public ::clang::ast_matchers::internal::MatcherInterface<NodeType> { \ : public ::clang::ast_matchers::internal::MatcherInterface<NodeType> { \
public: \ public: \
explicit matcher_##DefineMatcher##OverloadId##Matcher( \ explicit matcher_##DefineMatcher##OverloadId##Matcher(ParamType A##Param) \
ParamType const &A##Param) \ : Param(std::move(A##Param)) {} \
: Param(A##Param) {} \
bool matches(const NodeType &Node, \ bool matches(const NodeType &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder \ ::clang::ast_matchers::internal::BoundNodesTreeBuilder \
*Builder) const override; \ *Builder) const override; \
\ \
private: \ private: \
ParamType const Param; \ ParamType const Param; \
}; \ }; \
} \ } \
inline ::clang::ast_matchers::internal::PolymorphicMatcherWithParam1< \ inline ::clang::ast_matchers::internal::PolymorphicMatcherWithParam1< \
internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType, \ internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType, \
ReturnTypesF> \ ReturnTypesF> \
DefineMatcher(ParamType const &Param) { \ DefineMatcher(ParamType Param) { \
return ::clang::ast_matchers::internal::PolymorphicMatcherWithParam1< \ return ::clang::ast_matchers::internal::PolymorphicMatcherWithParam1< \
internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType, \ internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType, \
ReturnTypesF>(Param); \ ReturnTypesF>(std::move(Param)); \
} \ } \
typedef ::clang::ast_matchers::internal::PolymorphicMatcherWithParam1< \ typedef ::clang::ast_matchers::internal::PolymorphicMatcherWithParam1< \
internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType, \ internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType, \
ReturnTypesF>(&DefineMatcher##_Type##OverloadId)( \ ReturnTypesF> (&DefineMatcher##_Type##OverloadId)(ParamType Param); \
ParamType const &Param); \
template <typename NodeType, typename ParamT> \ template <typename NodeType, typename ParamT> \
bool internal:: \ bool internal:: \
matcher_##DefineMatcher##OverloadId##Matcher<NodeType, ParamT>::matches( \ matcher_##DefineMatcher##OverloadId##Matcher<NodeType, ParamT>::matches( \
const NodeType &Node, \ const NodeType &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) \ ::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) \
const const
Show All 13 Lines
#define AST_POLYMORPHIC_MATCHER_P2_OVERLOAD(DefineMatcher, ReturnTypesF, \ #define AST_POLYMORPHIC_MATCHER_P2_OVERLOAD(DefineMatcher, ReturnTypesF, \
ParamType1, Param1, ParamType2, \ ParamType1, Param1, ParamType2, \
Param2, OverloadId) \ Param2, OverloadId) \
namespace internal { \ namespace internal { \
template <typename NodeType, typename ParamT1, typename ParamT2> \ template <typename NodeType, typename ParamT1, typename ParamT2> \
class matcher_##DefineMatcher##OverloadId##Matcher \ class matcher_##DefineMatcher##OverloadId##Matcher \
: public ::clang::ast_matchers::internal::MatcherInterface<NodeType> { \ : public ::clang::ast_matchers::internal::MatcherInterface<NodeType> { \
public: \ public: \
matcher_##DefineMatcher##OverloadId##Matcher(ParamType1 const &A##Param1, \ matcher_##DefineMatcher##OverloadId##Matcher(ParamType1 A##Param1, \
ParamType2 const &A##Param2) \ ParamType2 A##Param2) \
: Param1(A##Param1), Param2(A##Param2) {} \ : Param1(std::move(A##Param1)), Param2(std::move(A##Param2)) {} \
bool matches(const NodeType &Node, \ bool matches(const NodeType &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder \ ::clang::ast_matchers::internal::BoundNodesTreeBuilder \
*Builder) const override; \ *Builder) const override; \
\ \
private: \ private: \
ParamType1 const Param1; \ ParamType1 const Param1; \
ParamType2 const Param2; \ ParamType2 const Param2; \
}; \ }; \
} \ } \
inline ::clang::ast_matchers::internal::PolymorphicMatcherWithParam2< \ inline ::clang::ast_matchers::internal::PolymorphicMatcherWithParam2< \
internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType1, \ internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType1, \
ParamType2, ReturnTypesF> \ ParamType2, ReturnTypesF> \
DefineMatcher(ParamType1 const &Param1, ParamType2 const &Param2) { \ DefineMatcher(ParamType1 Param1, ParamType2 Param2) { \
return ::clang::ast_matchers::internal::PolymorphicMatcherWithParam2< \ return ::clang::ast_matchers::internal::PolymorphicMatcherWithParam2< \
internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType1, \ internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType1, \
ParamType2, ReturnTypesF>(Param1, Param2); \ ParamType2, ReturnTypesF>(std::move(Param1), std::move(Param2)); \
} \ } \
typedef ::clang::ast_matchers::internal::PolymorphicMatcherWithParam2< \ typedef ::clang::ast_matchers::internal::PolymorphicMatcherWithParam2< \
internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType1, \ internal::matcher_##DefineMatcher##OverloadId##Matcher, ParamType1, \
ParamType2, ReturnTypesF>(&DefineMatcher##_Type##OverloadId)( \ ParamType2, ReturnTypesF> (&DefineMatcher##_Type##OverloadId)( \
ParamType1 const &Param1, ParamType2 const &Param2); \ ParamType1 Param1, ParamType2 Param2); \
template <typename NodeType, typename ParamT1, typename ParamT2> \ template <typename NodeType, typename ParamT1, typename ParamT2> \
bool internal::matcher_##DefineMatcher##OverloadId##Matcher< \ bool internal::matcher_##DefineMatcher##OverloadId##Matcher< \
NodeType, ParamT1, ParamT2>:: \ NodeType, ParamT1, ParamT2>:: \
matches(const NodeType &Node, \ matches(const NodeType &Node, \
::clang::ast_matchers::internal::ASTMatchFinder *Finder, \ ::clang::ast_matchers::internal::ASTMatchFinder *Finder, \
::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) \ ::clang::ast_matchers::internal::BoundNodesTreeBuilder *Builder) \
const const
▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines