[PATCH] D75202: [ASTMatchers] HasNameMatcher handles `extern "C"`
Nathan James via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Wed Feb 26 14:11:41 PST 2020
njames93 updated this revision to Diff 246829.
njames93 marked an inline comment as done.
njames93 added a comment.
- Add extra test case
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D75202/new/
https://reviews.llvm.org/D75202
Files:
clang/lib/ASTMatchers/ASTMatchersInternal.cpp
clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
Index: clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
===================================================================
--- clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
+++ clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
@@ -1643,6 +1643,21 @@
EXPECT_TRUE(matches(code, fieldDecl(hasName("::a::F(int)::S::m"))));
}
+TEST(Matcher, HasNameQualifiedSupportsLinkage) {
+ // https://bugs.llvm.org/show_bug.cgi?id=42193
+ std::string code = R"cpp(namespace foo { extern "C" void test(); })cpp";
+ EXPECT_TRUE(matches(code, functionDecl(hasName("test"))));
+ EXPECT_TRUE(matches(code, functionDecl(hasName("foo::test"))));
+ EXPECT_TRUE(matches(code, functionDecl(hasName("::foo::test"))));
+ EXPECT_TRUE(notMatches(code, functionDecl(hasName("::test"))));
+
+ code = R"cpp(namespace foo { extern "C" { void test(); } })cpp";
+ EXPECT_TRUE(matches(code, functionDecl(hasName("test"))));
+ EXPECT_TRUE(matches(code, functionDecl(hasName("foo::test"))));
+ EXPECT_TRUE(matches(code, functionDecl(hasName("::foo::test"))));
+ EXPECT_TRUE(notMatches(code, functionDecl(hasName("::test"))));
+}
+
TEST(Matcher, HasAnyName) {
const std::string Code = "namespace a { namespace b { class C; } }";
Index: clang/lib/ASTMatchers/ASTMatchersInternal.cpp
===================================================================
--- clang/lib/ASTMatchers/ASTMatchersInternal.cpp
+++ clang/lib/ASTMatchers/ASTMatchersInternal.cpp
@@ -513,7 +513,13 @@
if (Ctx->isFunctionOrMethod())
return Patterns.foundMatch(/*AllowFullyQualified=*/false);
- for (; Ctx && isa<NamedDecl>(Ctx); Ctx = Ctx->getParent()) {
+ for (; Ctx; Ctx = Ctx->getParent()) {
+ // Linkage Spec can just be ignored
+ // FIXME: Any other DeclContext kinds that can be safely disregarded
+ if (isa<LinkageSpecDecl>(Ctx))
+ continue;
+ if (!isa<NamedDecl>(Ctx))
+ break;
if (Patterns.foundMatch(/*AllowFullyQualified=*/false))
return true;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75202.246829.patch
Type: text/x-patch
Size: 1981 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200226/9a3e2428/attachment.bin>
More information about the cfe-commits
mailing list