massberg updated this revision to Diff 533204.
massberg marked 2 inline comments as done.
massberg added a comment.
Switched the "Hover, All" test to run with C++20 instead of C++17 and moved the
RewrittenBinaryOperatorSpaceship test to it.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D153331/new/
https://reviews.llvm.org/D153331
Files:
clang-tools-extra/clangd/FindTarget.cpp
clang-tools-extra/clangd/unittests/FindTargetTests.cpp
clang-tools-extra/clangd/unittests/HoverTests.cpp
Index: clang-tools-extra/clangd/unittests/HoverTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/HoverTests.cpp
+++ clang-tools-extra/clangd/unittests/HoverTests.cpp
@@ -2926,6 +2926,41 @@
HI.Definition = "__attribute__((nonnull))";
HI.Documentation = Attr::getDocumentation(attr::NonNull).str();
}},
+ {
+ R"cpp(
+ namespace std {
+ struct strong_ordering {
+ int n;
+ constexpr operator int() const { return n; }
+ static const strong_ordering equal, greater, less;
+ };
+ constexpr strong_ordering strong_ordering::equal = {0};
+ constexpr strong_ordering strong_ordering::greater = {1};
+ constexpr strong_ordering strong_ordering::less = {-1};
+ }
+
+ struct Foo
+ {
+ int x;
+ // Foo spaceship
+ auto operator<=>(const Foo&) const = default;
+ };
+
+ bool x = Foo(1) [[!^=]] Foo(2);
+ )cpp",
+ [](HoverInfo &HI) {
+ HI.Type = "bool (const Foo &) const noexcept";
+ HI.Value = "true";
+ HI.Name = "operator==";
+ HI.Parameters = {{{"const Foo &"}, std::nullopt, std::nullopt}};
+ HI.ReturnType = "bool";
+ HI.Kind = index::SymbolKind::InstanceMethod;
+ HI.LocalScope = "Foo::";
+ HI.NamespaceScope = "";
+ HI.Definition =
+ "bool operator==(const Foo &) const noexcept = default";
+ HI.Documentation = "Foo spaceship";
+ }},
};
// Create a tiny index, so tests above can verify documentation is fetched.
@@ -2941,7 +2976,7 @@
Annotations T(Case.Code);
TestTU TU = TestTU::withCode(T.code());
- TU.ExtraArgs.push_back("-std=c++17");
+ TU.ExtraArgs.push_back("-std=c++20");
TU.ExtraArgs.push_back("-xobjective-c++");
TU.ExtraArgs.push_back("-Wno-gnu-designator");
@@ -4047,7 +4082,6 @@
EXPECT_TRUE(H->Value);
EXPECT_TRUE(H->Type);
}
-
} // namespace
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/unittests/FindTargetTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FindTargetTests.cpp
+++ clang-tools-extra/clangd/unittests/FindTargetTests.cpp
@@ -618,6 +618,36 @@
EXPECT_DECLS("RecordTypeLoc", "struct executor");
}
+TEST_F(TargetDeclTest, RewrittenBinaryOperator) {
+ Flags.push_back("-std=c++20");
+
+ Code = R"cpp(
+ namespace std {
+ struct strong_ordering {
+ int n;
+ constexpr operator int() const { return n; }
+ static const strong_ordering equal, greater, less;
+ };
+ constexpr strong_ordering strong_ordering::equal = {0};
+ constexpr strong_ordering strong_ordering::greater = {1};
+ constexpr strong_ordering strong_ordering::less = {-1};
+ }
+
+ struct Foo
+ {
+ int x;
+ auto operator<=>(const Foo&) const = default;
+ };
+
+ bool x = (Foo(1) [[!=]] Foo(2));
+ )cpp";
+ EXPECT_DECLS("CXXRewrittenBinaryOperator",
+ {"std::strong_ordering operator<=>(const Foo &) const = default",
+ Rel::TemplatePattern},
+ {"bool operator==(const Foo &) const noexcept = default",
+ Rel::TemplateInstantiation});
+}
+
TEST_F(TargetDeclTest, FunctionTemplate) {
Code = R"cpp(
// Implicit specialization.
Index: clang-tools-extra/clangd/FindTarget.cpp
===================================================================
--- clang-tools-extra/clangd/FindTarget.cpp
+++ clang-tools-extra/clangd/FindTarget.cpp
@@ -347,6 +347,10 @@
void VisitCXXDeleteExpr(const CXXDeleteExpr *CDE) {
Outer.add(CDE->getOperatorDelete(), Flags);
}
+ void
+ VisitCXXRewrittenBinaryOperator(const CXXRewrittenBinaryOperator *RBO) {
+ Outer.add(RBO->getDecomposedForm().InnerBinOp, Flags);
+ }
};
Visitor(*this, Flags).Visit(S);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
