steveire updated this revision to Diff 332119.
steveire added a comment.
Update
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D98775/new/
https://reviews.llvm.org/D98775
Files:
clang/include/clang/Tooling/NodeIntrospection.h
clang/lib/Tooling/CMakeLists.txt
clang/lib/Tooling/DumpTool/ASTSrcLocProcessor.cpp
clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
clang/unittests/Introspection/IntrospectionTest.cpp
Index: clang/unittests/Introspection/IntrospectionTest.cpp
===================================================================
--- clang/unittests/Introspection/IntrospectionTest.cpp
+++ clang/unittests/Introspection/IntrospectionTest.cpp
@@ -42,7 +42,7 @@
#define STRING_LOCATION_PAIR(INSTANCE, LOC) Pair(#LOC, INSTANCE->LOC)
-TEST(Introspection, SourceLocations) {
+TEST(Introspection, SourceLocations_Stmt) {
auto AST = buildASTFromCode("void foo() {} void bar() { foo(); }", "foo.cpp",
std::make_shared<PCHContainerOperations>());
auto &Ctx = AST->getASTContext();
@@ -79,3 +79,69 @@
EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(STRING_LOCATION_PAIR(
FooCall, getSourceRange())));
}
+
+TEST(Introspection, SourceLocations_Decl) {
+ auto AST =
+ buildASTFromCode(R"cpp(
+namespace ns1 {
+namespace ns2 {
+template <typename T, typename U> struct Foo {};
+template <typename T, typename U> struct Bar {
+ struct Nested {
+ template <typename A, typename B>
+ Foo<A, B> method(int i, bool b) const noexcept(true);
+ };
+};
+} // namespace ns2
+} // namespace ns1
+
+template <typename T, typename U>
+template <typename A, typename B>
+ns1::ns2::Foo<A, B> ns1::ns2::Bar<T, U>::Nested::method(int i, bool b) const
+ noexcept(true) {}
+)cpp",
+ "foo.cpp", std::make_shared<PCHContainerOperations>());
+ auto &Ctx = AST->getASTContext();
+ auto &TU = *Ctx.getTranslationUnitDecl();
+
+ auto BoundNodes = ast_matchers::match(
+ decl(hasDescendant(
+ cxxMethodDecl(hasName("method"), isDefinition()).bind("method"))),
+ TU, Ctx);
+
+ EXPECT_EQ(BoundNodes.size(), 1u);
+
+ auto *MethodDecl = BoundNodes[0].getNodeAs<CXXMethodDecl>("method");
+
+ auto Result = NodeIntrospection::GetLocations(MethodDecl);
+
+ if (Result.LocationAccessors.empty() && Result.RangeAccessors.empty()) {
+ return;
+ }
+
+ auto ExpectedLocations =
+ FormatExpected<SourceLocation>(Result.LocationAccessors);
+
+ EXPECT_THAT(ExpectedLocations,
+ UnorderedElementsAre(
+ STRING_LOCATION_PAIR(MethodDecl, getBeginLoc()),
+ STRING_LOCATION_PAIR(MethodDecl, getBodyRBrace()),
+ STRING_LOCATION_PAIR(MethodDecl, getEllipsisLoc()),
+ STRING_LOCATION_PAIR(MethodDecl, getInnerLocStart()),
+ STRING_LOCATION_PAIR(MethodDecl, getLocation()),
+ STRING_LOCATION_PAIR(MethodDecl, getOuterLocStart()),
+ STRING_LOCATION_PAIR(MethodDecl, getPointOfInstantiation()),
+ STRING_LOCATION_PAIR(MethodDecl, getTypeSpecEndLoc()),
+ STRING_LOCATION_PAIR(MethodDecl, getTypeSpecStartLoc()),
+ STRING_LOCATION_PAIR(MethodDecl, getEndLoc())));
+
+ auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
+
+ EXPECT_THAT(
+ ExpectedRanges,
+ UnorderedElementsAre(
+ STRING_LOCATION_PAIR(MethodDecl, getExceptionSpecSourceRange()),
+ STRING_LOCATION_PAIR(MethodDecl, getParametersSourceRange()),
+ STRING_LOCATION_PAIR(MethodDecl, getReturnTypeSourceRange()),
+ STRING_LOCATION_PAIR(MethodDecl, getSourceRange())));
+}
Index: clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
===================================================================
--- clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
+++ clang/lib/Tooling/DumpTool/generate_cxx_src_locs.py
@@ -177,6 +177,9 @@
NodeLocationAccessors NodeIntrospection::GetLocations(clang::Stmt const *) {
return {};
}
+NodeLocationAccessors NodeIntrospection::GetLocations(clang::Decl const *) {
+ return {};
+}
NodeLocationAccessors
NodeIntrospection::GetLocations(clang::DynTypedNode const &) {
return {};
Index: clang/lib/Tooling/DumpTool/ASTSrcLocProcessor.cpp
===================================================================
--- clang/lib/Tooling/DumpTool/ASTSrcLocProcessor.cpp
+++ clang/lib/Tooling/DumpTool/ASTSrcLocProcessor.cpp
@@ -26,7 +26,8 @@
isDefinition(),
isSameOrDerivedFrom(
// TODO: Extend this with other clades
- namedDecl(hasName("clang::Stmt")).bind("nodeClade")),
+ namedDecl(hasAnyName("clang::Stmt", "clang::Decl"))
+ .bind("nodeClade")),
optionally(isDerivedFrom(cxxRecordDecl().bind("derivedFrom"))))
.bind("className"),
this);
Index: clang/lib/Tooling/CMakeLists.txt
===================================================================
--- clang/lib/Tooling/CMakeLists.txt
+++ clang/lib/Tooling/CMakeLists.txt
@@ -40,6 +40,9 @@
NodeLocationAccessors NodeIntrospection::GetLocations(clang::Stmt const *) {
return {};
}
+NodeLocationAccessors NodeIntrospection::GetLocations(clang::Decl const *) {
+ return {};
+}
NodeLocationAccessors
NodeIntrospection::GetLocations(clang::DynTypedNode const &) {
return {};
Index: clang/include/clang/Tooling/NodeIntrospection.h
===================================================================
--- clang/include/clang/Tooling/NodeIntrospection.h
+++ clang/include/clang/Tooling/NodeIntrospection.h
@@ -22,6 +22,7 @@
namespace clang {
class Stmt;
+class Decl;
namespace tooling {
@@ -78,6 +79,7 @@
namespace NodeIntrospection {
NodeLocationAccessors GetLocations(clang::Stmt const *Object);
+NodeLocationAccessors GetLocations(clang::Decl const *Object);
NodeLocationAccessors GetLocations(clang::DynTypedNode const &Node);
} // namespace NodeIntrospection
} // namespace tooling
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
