ajohnson-uoregon updated this revision to Diff 413962. ajohnson-uoregon added a comment.
Figuring out git-clang-format Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D120949/new/ https://reviews.llvm.org/D120949 Files: clang/docs/LibASTMatchersReference.html clang/include/clang/ASTMatchers/ASTMatchers.h clang/lib/ASTMatchers/ASTMatchersInternal.cpp clang/lib/ASTMatchers/Dynamic/Registry.cpp clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
Index: clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp =================================================================== --- clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp +++ clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp @@ -2509,6 +2509,28 @@ EXPECT_FALSE(Finder.addDynamicMatcher(hasName("x"), nullptr)); } +TEST(ASTMatchersTest, AttributedStmtBasic) { + StringRef Code = "int foo() { [[likely]] return 1; }"; + EXPECT_TRUE( + matchesConditionally(Code, attributedStmt(), true, {"-std=c++20"})); +} + +TEST(ASTMatchersTest, AttributedStmt_isAttr) { + StringRef Code = "int foo() { [[unlikely]] return 1; }"; + EXPECT_TRUE(matchesConditionally(Code, attributedStmt(isAttr(attr::Unlikely)), + true, {"-std=c++20"})); + EXPECT_FALSE(matchesConditionally(Code, attributedStmt(isAttr(attr::Builtin)), + true, {"-std=c++20"})); +} + +TEST(ASTMatchersTest, AttributedStmt_hasSubStmt) { + StringRef Code = "int foo() { [[likely]] return 1; }"; + EXPECT_TRUE(matchesConditionally( + Code, attributedStmt(hasSubStmt(returnStmt())), true, {"-std=c++20"})); + EXPECT_FALSE(matchesConditionally(Code, attributedStmt(hasSubStmt(ifStmt())), + true, {"-std=c++20"})); +} + TEST(MatchFinderAPI, MatchesDynamic) { StringRef SourceCode = "struct A { void f() {} };"; auto Matcher = functionDecl(isDefinition()).bind("method"); Index: clang/lib/ASTMatchers/Dynamic/Registry.cpp =================================================================== --- clang/lib/ASTMatchers/Dynamic/Registry.cpp +++ clang/lib/ASTMatchers/Dynamic/Registry.cpp @@ -142,6 +142,7 @@ REGISTER_MATCHER(atomicExpr); REGISTER_MATCHER(atomicType); REGISTER_MATCHER(attr); + REGISTER_MATCHER(attributedStmt); REGISTER_MATCHER(autoType); REGISTER_MATCHER(autoreleasePoolStmt) REGISTER_MATCHER(binaryConditionalOperator); @@ -355,6 +356,7 @@ REGISTER_MATCHER(hasSpecializedTemplate); REGISTER_MATCHER(hasStaticStorageDuration); REGISTER_MATCHER(hasStructuredBlock); + REGISTER_MATCHER(hasSubStmt); REGISTER_MATCHER(hasSyntacticForm); REGISTER_MATCHER(hasTargetDecl); REGISTER_MATCHER(hasTemplateArgument); @@ -395,6 +397,7 @@ REGISTER_MATCHER(isArrow); REGISTER_MATCHER(isAssignmentOperator); REGISTER_MATCHER(isAtPosition); + REGISTER_MATCHER(isAttr); REGISTER_MATCHER(isBaseInitializer); REGISTER_MATCHER(isBitField); REGISTER_MATCHER(isCatchAll); Index: clang/lib/ASTMatchers/ASTMatchersInternal.cpp =================================================================== --- clang/lib/ASTMatchers/ASTMatchersInternal.cpp +++ clang/lib/ASTMatchers/ASTMatchersInternal.cpp @@ -981,6 +981,8 @@ predefinedExpr; const internal::VariadicDynCastAllOfMatcher<Stmt, DesignatedInitExpr> designatedInitExpr; +const internal::VariadicDynCastAllOfMatcher<Stmt, AttributedStmt> + attributedStmt; const internal::VariadicOperatorMatcherFunc< 2, std::numeric_limits<unsigned>::max()> eachOf = {internal::DynTypedMatcher::VO_EachOf}; Index: clang/include/clang/ASTMatchers/ASTMatchers.h =================================================================== --- clang/include/clang/ASTMatchers/ASTMatchers.h +++ clang/include/clang/ASTMatchers/ASTMatchers.h @@ -2699,6 +2699,60 @@ return Node.size() == N; } +/// Matches the attribute(s) attached to a Stmt +/// +/// Given: +/// \code +/// constexpr double pow(double x, long long n) noexcept { +/// if (n > 0) [[likely]] +/// return x * pow(x, n - 1); +/// else [[unlikely]] +/// return 1; +/// } +/// \endcode +/// attributedStmt() matches "[[likely]] return ...;" and +/// "[[unlikely]] return 1;" +extern const internal::VariadicDynCastAllOfMatcher<Stmt, AttributedStmt> + attributedStmt; + +/// Matches the specified attribute. +/// +/// Example: +/// \code +/// attributedStmt(isAttr(attr::Likely)) +/// \endcode +/// would only match "[[likely]] return ...;" here: +/// \code +/// constexpr double pow(double x, long long n) noexcept { +/// if (n > 0) [[likely]] +/// return x * pow(x, n - 1); +/// else [[unlikely]] +/// return 1; +/// } +/// \endcode +AST_MATCHER_P(AttributedStmt, isAttr, attr::Kind, AttrKind) { + return llvm::any_of(Node.getAttrs(), + [&](const Attr *A) { return A->getKind() == AttrKind; }); +} + +/// Matches the statement an attribute is attached to. +/// +/// Example: +/// \code +/// attributedStmt(hasSubStmt(returnStmt())) +/// \endcode +/// would match "return 1;" here: +/// \code +/// else [[unlikely]] +/// return 1; +/// \endcode +AST_MATCHER_P(AttributedStmt, hasSubStmt, internal::Matcher<Stmt>, + InnerMatcher) { + const Stmt *Statement = Node.getSubStmt(); + return Statement != nullptr && + InnerMatcher.matches(*Statement, Finder, Builder); +} + /// Matches \c QualTypes in the clang AST. extern const internal::VariadicAllOfMatcher<QualType> qualType; Index: clang/docs/LibASTMatchersReference.html =================================================================== --- clang/docs/LibASTMatchersReference.html +++ clang/docs/LibASTMatchersReference.html @@ -1283,6 +1283,21 @@ </pre></td></tr> +<tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1Stmt.html">Stmt</a>></td><td class="name" onclick="toggle('attributedStmt0')"><a name="attributedStmt0Anchor">attributedStmt</a></td><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1AttributedStmt.html">AttributedStmt</a>>...</td></tr> +<tr><td colspan="4" class="doc" id="attributedStmt0"><pre>Matches the attribute(s) attached to a Stmt + +Given: + constexpr double pow(double x, long long n) noexcept { + if (n > 0) [[likely]] + return x * pow(x, n - 1); + else [[unlikely]] + return 1; + } +attributedStmt() matches "[[likely]] return ...;" and +"[[unlikely]] return 1;" +</pre></td></tr> + + <tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1Stmt.html">Stmt</a>></td><td class="name" onclick="toggle('autoreleasePoolStmt0')"><a name="autoreleasePoolStmt0Anchor">autoreleasePoolStmt</a></td><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1ObjCAutoreleasePoolStmt.html">ObjCAutoreleasePoolStmt</a>>...</td></tr> <tr><td colspan="4" class="doc" id="autoreleasePoolStmt0"><pre>Matches an Objective-C autorelease pool statement. @@ -2852,6 +2867,21 @@ </pre></td></tr> +<tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1AttributedStmt.html">AttributedStmt</a>></td><td class="name" onclick="toggle('isAttr0')"><a name="isAttr0Anchor">isAttr</a></td><td>attr::Kind AttrKind</td></tr> +<tr><td colspan="4" class="doc" id="isAttr0"><pre>Matches the specified attribute. + +Example: + attributedStmt(isAttr(attr::Likely)) +would only match "[[likely]] return ...;" here: + constexpr double pow(double x, long long n) noexcept { + if (n > 0) [[likely]] + return x * pow(x, n - 1); + else [[unlikely]] + return 1; + } +</pre></td></tr> + + <tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1Attr.html">Attr</a>></td><td class="name" onclick="toggle('isImplicit1')"><a name="isImplicit1Anchor">isImplicit</a></td><td></td></tr> <tr><td colspan="4" class="doc" id="isImplicit1"><pre>Matches an entity that has been implicitly added by the compiler (e.g. implicit default/copy constructors). @@ -6214,6 +6244,17 @@ </pre></td></tr> +<tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1AttributedStmt.html">AttributedStmt</a>></td><td class="name" onclick="toggle('hasSubStmt0')"><a name="hasSubStmt0Anchor">hasSubStmt</a></td><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1Stmt.html">Stmt</a>> InnerMatcher</td></tr> +<tr><td colspan="4" class="doc" id="hasSubStmt0"><pre>Matches the statement an attribute is attached to. + +Example: + attributedStmt(hasSubStmt(returnStmt())) +would match "return 1;" here: + else [[unlikely]] + return 1; +</pre></td></tr> + + <tr><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1AutoType.html">AutoType</a>></td><td class="name" onclick="toggle('hasDeducedType0')"><a name="hasDeducedType0Anchor">hasDeducedType</a></td><td>Matcher<<a href="https://clang.llvm.org/doxygen/classclang_1_1Type.html">Type</a>></td></tr> <tr><td colspan="4" class="doc" id="hasDeducedType0"><pre>Matches AutoType nodes where the deduced type is a specific type. @@ -9799,5 +9840,3 @@ </div> </body> </html> - -
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits