[clang] 4f6d698 - [AST] Fix location call storage with common last-invocation
Stephen Kelly via cfe-commits
cfe-commits at lists.llvm.org
Thu Apr 15 15:15:54 PDT 2021
Author: Stephen Kelly
Date: 2021-04-15T23:15:11+01:00
New Revision: 4f6d69846747dd53a54a5de0da7eca38df52d5ca
URL: https://github.com/llvm/llvm-project/commit/4f6d69846747dd53a54a5de0da7eca38df52d5ca
DIFF: https://github.com/llvm/llvm-project/commit/4f6d69846747dd53a54a5de0da7eca38df52d5ca.diff
LOG: [AST] Fix location call storage with common last-invocation
Differential Revision: https://reviews.llvm.org/D100548
Added:
Modified:
clang/lib/Tooling/NodeIntrospection.cpp
clang/unittests/Introspection/IntrospectionTest.cpp
Removed:
################################################################################
diff --git a/clang/lib/Tooling/NodeIntrospection.cpp b/clang/lib/Tooling/NodeIntrospection.cpp
index 2ee0b1cae55b..0e3ef3c6a01e 100644
--- a/clang/lib/Tooling/NodeIntrospection.cpp
+++ b/clang/lib/Tooling/NodeIntrospection.cpp
@@ -66,13 +66,15 @@ bool RangeLessThan::operator()(
else if (LHS.first.getEnd() != RHS.first.getEnd())
return false;
- return LHS.second->name() < RHS.second->name();
+ return LocationCallFormatterCpp::format(*LHS.second) <
+ LocationCallFormatterCpp::format(*RHS.second);
}
bool RangeLessThan::operator()(
std::pair<SourceLocation, SharedLocationCall> const &LHS,
std::pair<SourceLocation, SharedLocationCall> const &RHS) const {
if (LHS.first == RHS.first)
- return LHS.second->name() < RHS.second->name();
+ return LocationCallFormatterCpp::format(*LHS.second) <
+ LocationCallFormatterCpp::format(*RHS.second);
return LHS.first < RHS.first;
}
} // namespace internal
diff --git a/clang/unittests/Introspection/IntrospectionTest.cpp b/clang/unittests/Introspection/IntrospectionTest.cpp
index 880068c43b6e..2df401c8d813 100644
--- a/clang/unittests/Introspection/IntrospectionTest.cpp
+++ b/clang/unittests/Introspection/IntrospectionTest.cpp
@@ -45,6 +45,31 @@ FormatExpected(const MapType &Accessors) {
#define STRING_LOCATION_PAIR(INSTANCE, LOC) Pair(#LOC, INSTANCE->LOC)
+TEST(Introspection, SourceLocations_CallContainer) {
+ SourceLocationMap slm;
+ SharedLocationCall Prefix;
+ slm.insert(std::make_pair(
+ SourceLocation(),
+ llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getSourceRange")));
+ EXPECT_EQ(slm.size(), 1u);
+
+ auto callTypeLoc =
+ llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getTypeLoc");
+ slm.insert(std::make_pair(
+ SourceLocation(),
+ llvm::makeIntrusiveRefCnt<LocationCall>(callTypeLoc, "getSourceRange")));
+ EXPECT_EQ(slm.size(), 2u);
+}
+
+TEST(Introspection, SourceLocations_CallChainFormatting) {
+ SharedLocationCall Prefix;
+ auto chainedCall = llvm::makeIntrusiveRefCnt<LocationCall>(
+ llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getTypeLoc"),
+ "getSourceRange");
+ EXPECT_EQ(LocationCallFormatterCpp::format(*chainedCall),
+ "getTypeLoc().getSourceRange()");
+}
+
TEST(Introspection, SourceLocations_Stmt) {
if (!NodeIntrospection::hasIntrospectionSupport())
return;
More information about the cfe-commits
mailing list