This is an archive of the discontinued LLVM Phabricator instance.

Differential D73869

[clang][AST] Add an AST matcher for deducedTemplateSpeializationType.
ClosedPublic

Authored by hokein on Feb 3 2020, 2:30 AM.

Details

Reviewers
gribozavr2
Commits
rGbdbdf7482255: [clang][AST] Add an AST matcher for deducedTemplateSpeializationType.
Summary

misc-unused-using clang-tidy check needs this matcher to fix a false
positive of C++17 deduced class template types.

Diff Detail

Event Timeline

hokein created this revision.Feb 3 2020, 2:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 3 2020, 2:30 AM
gribozavr2 accepted this revision.Feb 3 2020, 2:44 AM
gribozavr2 added inline comments.
clang/include/clang/ASTMatchers/ASTMatchers.h
6043

"in the declaration of the variable \c c"

This revision is now accepted and ready to land.Feb 3 2020, 2:44 AM
hokein updated this revision to Diff 242007.Feb 3 2020, 3:09 AM
hokein marked an inline comment as done.

address review comment.

Closed by commit rGbdbdf7482255: [clang][AST] Add an AST matcher for deducedTemplateSpeializationType. (authored by hokein). · Explain WhyFeb 3 2020, 3:14 AM
This revision was automatically updated to reflect the committed changes.
merge_guards_bot added a subscriber: merge_guards_bot.Feb 3 2020, 3:29 AM

Unit tests: pass. 62408 tests passed, 0 failed and 839 were skipped.

clang-tidy: pass.

clang-format: fail. Please format your changes with clang-format by running git-clang-format HEAD^ or applying this patch.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

Harbormaster failed remote builds in B45565: Diff 242003!Feb 3 2020, 3:34 AM
merge_guards_bot added a comment.Feb 3 2020, 3:45 AM

Unit tests: pass. 62408 tests passed, 0 failed and 839 were skipped.

clang-tidy: pass.

clang-format: fail. Please format your changes with clang-format by running git-clang-format HEAD^ or applying this patch.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

Harbormaster failed remote builds in B45566: Diff 242007!Feb 3 2020, 3:45 AM

Revision Contents

PathSize
clang/
docs/
15 lines
include/
clang/
ASTMatchers/
14 lines
lib/
ASTMatchers/
Dynamic/
1 line
unittests/
ASTMatchers/
6 lines

Diff 242003

clang/docs/LibASTMatchersReference.html

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 1,744 Lines • ▼ Show 20 LinesGiven:
short i = 1; short i = 1;
int j = 42; int j = 42;
decltype(i + j) result = i + j; decltype(i + j) result = i + j;
decltypeType() decltypeType()
matches "decltype(i + j)" matches "decltype(i + j)"
</pre></td></tr> </pre></td></tr>
<tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1Type.html">Type</a>&gt;</td><td class="name" onclick="toggle('deducedTemplateSpecializationType0')"><a name="deducedTemplateSpecializationType0Anchor">deducedTemplateSpecializationType</a></td><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1DeducedTemplateSpecializationType.html">DeducedTemplateSpecializationType</a>&gt;...</td></tr>
<tr><td colspan="4" class="doc" id="deducedTemplateSpecializationType0"><pre>Matches C++17 deduced template specialization types, e.g. deduced class
template types.
Given
template &lt;typename T&gt;
class C { public: C(T); };
C c(123);
deducedTemplateSpecializationType() matches the type in c.
</pre></td></tr>
<tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1Type.html">Type</a>&gt;</td><td class="name" onclick="toggle('dependentSizedArrayType0')"><a name="dependentSizedArrayType0Anchor">dependentSizedArrayType</a></td><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1DependentSizedArrayType.html">DependentSizedArrayType</a>&gt;...</td></tr> <tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1Type.html">Type</a>&gt;</td><td class="name" onclick="toggle('dependentSizedArrayType0')"><a name="dependentSizedArrayType0Anchor">dependentSizedArrayType</a></td><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1DependentSizedArrayType.html">DependentSizedArrayType</a>&gt;...</td></tr>
<tr><td colspan="4" class="doc" id="dependentSizedArrayType0"><pre>Matches C++ arrays whose size is a value-dependent expression. <tr><td colspan="4" class="doc" id="dependentSizedArrayType0"><pre>Matches C++ arrays whose size is a value-dependent expression.
Given Given
template&lt;typename T, int Size&gt; template&lt;typename T, int Size&gt;
class array { class array {
T data[Size]; T data[Size];
}; };
▲ Show 20 Lines • Show All 1,756 Lines • ▼ Show 20 Lines
(matcher = functionDecl(hasExternalFormalLinkage())) (matcher = functionDecl(hasExternalFormalLinkage()))
namespace { namespace {
void f() {} void f() {}
} }
</pre></td></tr> </pre></td></tr>
<tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1NamedDecl.html">NamedDecl</a>&gt;</td><td class="name" onclick="toggle('hasName0')"><a name="hasName0Anchor">hasName</a></td><td>const std::string Name</td></tr> <tr><td>Matcher&lt;<a href="https://clang.llvm.org/doxygen/classclang_1_1NamedDecl.html">NamedDecl</a>&gt;</td><td class="name" onclick="toggle('hasName0')"><a name="hasName0Anchor">hasName</a></td><td>StringRef Name</td></tr>
<tr><td colspan="4" class="doc" id="hasName0"><pre>Matches NamedDecl nodes that have the specified name. <tr><td colspan="4" class="doc" id="hasName0"><pre>Matches NamedDecl nodes that have the specified name.
Supports specifying enclosing namespaces or classes by prefixing the name Supports specifying enclosing namespaces or classes by prefixing the name
with '&lt;enclosing&gt;::'. with '&lt;enclosing&gt;::'.
Does not match typedefs of an underlying type with the given name. Does not match typedefs of an underlying type with the given name.
Example matches X (Name == "X") Example matches X (Name == "X")
class X; class X;
▲ Show 20 Lines • Show All 4,111 Lines • Show Last 20 Lines

clang/include/clang/ASTMatchers/ASTMatchers.h

Show First 20 Lines • Show All 6,024 Lines • ▼ Show 20 Lines
/// C<char> var; // B /// C<char> var; // B
/// \endcode /// \endcode
/// ///
/// \c templateSpecializationType() matches the type of the explicit /// \c templateSpecializationType() matches the type of the explicit
/// instantiation in \c A and the type of the variable declaration in \c B. /// instantiation in \c A and the type of the variable declaration in \c B.
extern const AstTypeMatcher<TemplateSpecializationType> extern const AstTypeMatcher<TemplateSpecializationType>
templateSpecializationType; templateSpecializationType;
/// Matches C++17 deduced template specialization types, e.g. deduced class
/// template types.
///
/// Given
/// \code
/// template <typename T>
/// class C { public: C(T); };
///
/// C c(123);
/// \endcode
/// \c deducedTemplateSpecializationType() matches the type in \c c.
gribozavr2Unsubmitted
Done
ReplyInline Actions

"in the declaration of the variable \c c"

gribozavr2: "in the declaration of the variable \c c"
extern const AstTypeMatcher<DeducedTemplateSpecializationType>
deducedTemplateSpecializationType;
/// Matches types nodes representing unary type transformations. /// Matches types nodes representing unary type transformations.
/// ///
/// Given: /// Given:
/// \code /// \code
/// typedef __underlying_type(T) type; /// typedef __underlying_type(T) type;
/// \endcode /// \endcode
/// unaryTransformType() /// unaryTransformType()
/// matches "__underlying_type(T)" /// matches "__underlying_type(T)"
▲ Show 20 Lines • Show All 1,033 Lines • Show Last 20 Lines

clang/lib/ASTMatchers/Dynamic/Registry.cpp

Show First 20 Lines • Show All 196 Lines • ▼ Show 20 LinesRegistryMaps::RegistryMaps() {
REGISTER_MATCHER(cxxUnresolvedConstructExpr); REGISTER_MATCHER(cxxUnresolvedConstructExpr);
REGISTER_MATCHER(decayedType); REGISTER_MATCHER(decayedType);
REGISTER_MATCHER(decl); REGISTER_MATCHER(decl);
REGISTER_MATCHER(declCountIs); REGISTER_MATCHER(declCountIs);
REGISTER_MATCHER(declRefExpr); REGISTER_MATCHER(declRefExpr);
REGISTER_MATCHER(declStmt); REGISTER_MATCHER(declStmt);
REGISTER_MATCHER(declaratorDecl); REGISTER_MATCHER(declaratorDecl);
REGISTER_MATCHER(decltypeType); REGISTER_MATCHER(decltypeType);
REGISTER_MATCHER(deducedTemplateSpecializationType);
REGISTER_MATCHER(defaultStmt); REGISTER_MATCHER(defaultStmt);
REGISTER_MATCHER(dependentSizedArrayType); REGISTER_MATCHER(dependentSizedArrayType);
REGISTER_MATCHER(designatedInitExpr); REGISTER_MATCHER(designatedInitExpr);
REGISTER_MATCHER(designatorCountIs); REGISTER_MATCHER(designatorCountIs);
REGISTER_MATCHER(doStmt); REGISTER_MATCHER(doStmt);
REGISTER_MATCHER(eachOf); REGISTER_MATCHER(eachOf);
REGISTER_MATCHER(elaboratedType); REGISTER_MATCHER(elaboratedType);
REGISTER_MATCHER(enumConstantDecl); REGISTER_MATCHER(enumConstantDecl);
▲ Show 20 Lines • Show All 489 Lines • Show Last 20 Lines

clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp

Show First 20 Lines • Show All 1,452 Lines • ▼ Show 20 Lines EXPECT_TRUE(matches("typedef int X; X a;", varDecl(hasName("a"),
hasType(typedefType())))); hasType(typedefType()))));
} }
TEST(TypeMatching, MatchesTemplateSpecializationType) { TEST(TypeMatching, MatchesTemplateSpecializationType) {
EXPECT_TRUE(matches("template <typename T> class A{}; A<int> a;", EXPECT_TRUE(matches("template <typename T> class A{}; A<int> a;",
templateSpecializationType())); templateSpecializationType()));
} }
TEST(TypeMatching, MatchesDeucedTemplateSpecializationType) {
EXPECT_TRUE(matches("template <typename T> class A{ public: A(T) {} }; A a(1);",
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  EXPECT_TRUE(matches("template <typename T> class A{ public: A(T) {} }; A a(1);",
-                      deducedTemplateSpecializationType(),
-                      LanguageMode::Cxx17OrLater));
+  EXPECT_TRUE(
+      matches("template <typename T> class A{ public: A(T) {} }; A a(1);",
+              deducedTemplateSpecializationType(), LanguageMode::Cxx17OrLater));
Lint: Pre-merge checks: clang-format: please reformat the code ``` - EXPECT_TRUE(matches("template <typename T> class…
deducedTemplateSpecializationType(),
LanguageMode::Cxx17OrLater));
}
TEST(TypeMatching, MatchesRecordType) { TEST(TypeMatching, MatchesRecordType) {
EXPECT_TRUE(matches("class C{}; C c;", recordType())); EXPECT_TRUE(matches("class C{}; C c;", recordType()));
EXPECT_TRUE(matches("struct S{}; S s;", EXPECT_TRUE(matches("struct S{}; S s;",
recordType(hasDeclaration(recordDecl(hasName("S")))))); recordType(hasDeclaration(recordDecl(hasName("S"))))));
EXPECT_TRUE(notMatches("int i;", EXPECT_TRUE(notMatches("int i;",
recordType(hasDeclaration(recordDecl(hasName("S")))))); recordType(hasDeclaration(recordDecl(hasName("S"))))));
} }
▲ Show 20 Lines • Show All 404 Lines • Show Last 20 Lines