hokein updated this revision to Diff 282509.
hokein added a comment.
address comments.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D85028/new/
https://reviews.llvm.org/D85028
Files:
clang-tools-extra/clangd/FindTarget.cpp
clang-tools-extra/clangd/XRefs.cpp
clang-tools-extra/clangd/unittests/FindTargetTests.cpp
Index: clang-tools-extra/clangd/unittests/FindTargetTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FindTargetTests.cpp
+++ clang-tools-extra/clangd/unittests/FindTargetTests.cpp
@@ -559,6 +559,37 @@
};
)cpp";
EXPECT_DECLS("UnresolvedMemberExpr", "void func(int *)", "void func(char
*)");
+
+ Flags.push_back("--target=x86_64-pc-linux-gnu");
+ Code = R"cpp(
+ struct X {
+ static void *operator new(unsigned long);
+ };
+ auto* k = [[new]] X();
+ )cpp";
+ EXPECT_DECLS("CXXNewExpr", "static void *operator new(unsigned long)");
+ Code = R"cpp(
+ void *operator new(unsigned long);
+ auto* k = [[new]] int();
+ )cpp";
+ EXPECT_DECLS("CXXNewExpr", "void *operator new(unsigned long)");
+
+ Code = R"cpp(
+ struct X {
+ static void operator delete(void *) noexcept;
+ };
+ void k(X* x) {
+ [[delete]] x;
+ }
+ )cpp";
+ EXPECT_DECLS("CXXDeleteExpr", "static void operator delete(void *)
noexcept");
+ Code = R"cpp(
+ void operator delete(void *) noexcept;
+ void k(int* x) {
+ [[delete]] x;
+ }
+ )cpp";
+ EXPECT_DECLS("CXXDeleteExpr", "void operator delete(void *) noexcept");
}
TEST_F(TargetDeclTest, DependentExprs) {
Index: clang-tools-extra/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/clangd/XRefs.cpp
+++ clang-tools-extra/clangd/XRefs.cpp
@@ -238,6 +238,11 @@
llvm::DenseMap<SymbolID, size_t> ResultIndex;
auto AddResultDecl = [&](const NamedDecl *D) {
+ // FIXME: C++ global operator new/delete are implicitly declared in every
+ // TU, these functions have invalid source location. In case where users
+ // provide these function definitions (to replace the default ones),
+ // getCanonicalDecl may return the implicit version, which will be dropped
+ // becase of the invalid source location.
D = llvm::cast<NamedDecl>(D->getCanonicalDecl());
auto Loc =
makeLocation(AST.getASTContext(), nameLocation(*D, SM), MainFilePath);
Index: clang-tools-extra/clangd/FindTarget.cpp
===================================================================
--- clang-tools-extra/clangd/FindTarget.cpp
+++ clang-tools-extra/clangd/FindTarget.cpp
@@ -460,6 +460,12 @@
void VisitPseudoObjectExpr(const PseudoObjectExpr *POE) {
Outer.add(POE->getSyntacticForm(), Flags);
}
+ void VisitCXXNewExpr(const CXXNewExpr *CNE) {
+ Outer.add(CNE->getOperatorNew(), Flags);
+ }
+ void VisitCXXDeleteExpr(const CXXDeleteExpr *CDE) {
+ Outer.add(CDE->getOperatorDelete(), Flags);
+ }
};
Visitor(*this, Flags).Visit(S);
}
Index: clang-tools-extra/clangd/unittests/FindTargetTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FindTargetTests.cpp
+++ clang-tools-extra/clangd/unittests/FindTargetTests.cpp
@@ -559,6 +559,37 @@
};
)cpp";
EXPECT_DECLS("UnresolvedMemberExpr", "void func(int *)", "void func(char *)");
+
+ Flags.push_back("--target=x86_64-pc-linux-gnu");
+ Code = R"cpp(
+ struct X {
+ static void *operator new(unsigned long);
+ };
+ auto* k = [[new]] X();
+ )cpp";
+ EXPECT_DECLS("CXXNewExpr", "static void *operator new(unsigned long)");
+ Code = R"cpp(
+ void *operator new(unsigned long);
+ auto* k = [[new]] int();
+ )cpp";
+ EXPECT_DECLS("CXXNewExpr", "void *operator new(unsigned long)");
+
+ Code = R"cpp(
+ struct X {
+ static void operator delete(void *) noexcept;
+ };
+ void k(X* x) {
+ [[delete]] x;
+ }
+ )cpp";
+ EXPECT_DECLS("CXXDeleteExpr", "static void operator delete(void *) noexcept");
+ Code = R"cpp(
+ void operator delete(void *) noexcept;
+ void k(int* x) {
+ [[delete]] x;
+ }
+ )cpp";
+ EXPECT_DECLS("CXXDeleteExpr", "void operator delete(void *) noexcept");
}
TEST_F(TargetDeclTest, DependentExprs) {
Index: clang-tools-extra/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/clangd/XRefs.cpp
+++ clang-tools-extra/clangd/XRefs.cpp
@@ -238,6 +238,11 @@
llvm::DenseMap<SymbolID, size_t> ResultIndex;
auto AddResultDecl = [&](const NamedDecl *D) {
+ // FIXME: C++ global operator new/delete are implicitly declared in every
+ // TU, these functions have invalid source location. In case where users
+ // provide these function definitions (to replace the default ones),
+ // getCanonicalDecl may return the implicit version, which will be dropped
+ // becase of the invalid source location.
D = llvm::cast<NamedDecl>(D->getCanonicalDecl());
auto Loc =
makeLocation(AST.getASTContext(), nameLocation(*D, SM), MainFilePath);
Index: clang-tools-extra/clangd/FindTarget.cpp
===================================================================
--- clang-tools-extra/clangd/FindTarget.cpp
+++ clang-tools-extra/clangd/FindTarget.cpp
@@ -460,6 +460,12 @@
void VisitPseudoObjectExpr(const PseudoObjectExpr *POE) {
Outer.add(POE->getSyntacticForm(), Flags);
}
+ void VisitCXXNewExpr(const CXXNewExpr *CNE) {
+ Outer.add(CNE->getOperatorNew(), Flags);
+ }
+ void VisitCXXDeleteExpr(const CXXDeleteExpr *CDE) {
+ Outer.add(CDE->getOperatorDelete(), 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
