This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG08c04ca00542: [clangd] Overload bundles are only deprecated
if each overloads is. (authored by sammccall).
Changed prior to commit:
https://reviews.llvm.org/D97803?vs=327574&id=366116#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D97803/new/
https://reviews.llvm.org/D97803
Files:
clang-tools-extra/clangd/CodeComplete.cpp
clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
Index: clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
+++ clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
@@ -1657,7 +1657,7 @@
std::string Context = R"cpp(
struct X {
// Overload with int
- int a(int);
+ int a(int) __attribute__((deprecated("", "")));
// Overload with bool
int a(bool);
int b(float);
@@ -1695,6 +1695,7 @@
EXPECT_EQ(A.ReturnType, "int"); // All overloads return int.
// For now we just return one of the doc strings arbitrarily.
ASSERT_TRUE(A.Documentation);
+ ASSERT_FALSE(A.Deprecated); // Not all overloads deprecated.
EXPECT_THAT(
A.Documentation->asPlainText(),
AnyOf(HasSubstr("Overload with int"), HasSubstr("Overload with bool")));
Index: clang-tools-extra/clangd/CodeComplete.cpp
===================================================================
--- clang-tools-extra/clangd/CodeComplete.cpp
+++ clang-tools-extra/clangd/CodeComplete.cpp
@@ -282,6 +282,7 @@
: ASTCtx(ASTCtx),
EnableFunctionArgSnippets(Opts.EnableFunctionArgSnippets),
IsUsingDeclaration(IsUsingDeclaration), NextTokenKind(NextTokenKind) {
+ Completion.Deprecated = true; // cleared by any non-deprecated overload.
add(C, SemaCCS);
if (C.SemaResult) {
assert(ASTCtx);
@@ -310,8 +311,6 @@
return std::tie(X.range.start.line, X.range.start.character) <
std::tie(Y.range.start.line, Y.range.start.character);
});
- Completion.Deprecated |=
- (C.SemaResult->Availability == CXAvailability_Deprecated);
}
if (C.IndexResult) {
Completion.Origin |= C.IndexResult->Origin;
@@ -333,7 +332,6 @@
}
Completion.RequiredQualifier = std::string(ShortestQualifier);
}
- Completion.Deprecated |= (C.IndexResult->Flags & Symbol::Deprecated);
}
if (C.IdentifierResult) {
Completion.Origin |= SymbolOrigin::Identifier;
@@ -409,6 +407,14 @@
/*CommentsFromHeader=*/false));
}
}
+ if (Completion.Deprecated) {
+ if (C.SemaResult)
+ Completion.Deprecated &=
+ C.SemaResult->Availability == CXAvailability_Deprecated;
+ if (C.IndexResult)
+ Completion.Deprecated &=
+ bool(C.IndexResult->Flags & Symbol::Deprecated);
+ }
}
CodeCompletion build() {
Index: clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
+++ clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
@@ -1657,7 +1657,7 @@
std::string Context = R"cpp(
struct X {
// Overload with int
- int a(int);
+ int a(int) __attribute__((deprecated("", "")));
// Overload with bool
int a(bool);
int b(float);
@@ -1695,6 +1695,7 @@
EXPECT_EQ(A.ReturnType, "int"); // All overloads return int.
// For now we just return one of the doc strings arbitrarily.
ASSERT_TRUE(A.Documentation);
+ ASSERT_FALSE(A.Deprecated); // Not all overloads deprecated.
EXPECT_THAT(
A.Documentation->asPlainText(),
AnyOf(HasSubstr("Overload with int"), HasSubstr("Overload with bool")));
Index: clang-tools-extra/clangd/CodeComplete.cpp
===================================================================
--- clang-tools-extra/clangd/CodeComplete.cpp
+++ clang-tools-extra/clangd/CodeComplete.cpp
@@ -282,6 +282,7 @@
: ASTCtx(ASTCtx),
EnableFunctionArgSnippets(Opts.EnableFunctionArgSnippets),
IsUsingDeclaration(IsUsingDeclaration), NextTokenKind(NextTokenKind) {
+ Completion.Deprecated = true; // cleared by any non-deprecated overload.
add(C, SemaCCS);
if (C.SemaResult) {
assert(ASTCtx);
@@ -310,8 +311,6 @@
return std::tie(X.range.start.line, X.range.start.character) <
std::tie(Y.range.start.line, Y.range.start.character);
});
- Completion.Deprecated |=
- (C.SemaResult->Availability == CXAvailability_Deprecated);
}
if (C.IndexResult) {
Completion.Origin |= C.IndexResult->Origin;
@@ -333,7 +332,6 @@
}
Completion.RequiredQualifier = std::string(ShortestQualifier);
}
- Completion.Deprecated |= (C.IndexResult->Flags & Symbol::Deprecated);
}
if (C.IdentifierResult) {
Completion.Origin |= SymbolOrigin::Identifier;
@@ -409,6 +407,14 @@
/*CommentsFromHeader=*/false));
}
}
+ if (Completion.Deprecated) {
+ if (C.SemaResult)
+ Completion.Deprecated &=
+ C.SemaResult->Availability == CXAvailability_Deprecated;
+ if (C.IndexResult)
+ Completion.Deprecated &=
+ bool(C.IndexResult->Flags & Symbol::Deprecated);
+ }
}
CodeCompletion build() {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
