maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CodeComplete] Ensure object is the same in compareOverloads() 

Summary:
This fixes a regression that led to size() not being available in clangd
when completing 'deque().^' and using libc++.

Reviewers: sammccall

Reviewed By: sammccall

Subscribers: jkorous, arphaman, kadircet, usaxena95, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D68335

llvm-svn: 373710
This commit is contained in:
Ilya Biryukov 2019-10-04 08:10:27 +00:00
parent 4c05658354
commit 8613e90ba7
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
View File

@ -2546,6 +2546,25 @@ TEST(CompletionTest, NamespaceDoubleInsertion) {
UnorderedElementsAre(AllOf(Qualifier(""), Named("ABCDE"))));
}
TEST(CompletionTest, DerivedMethodsAreAlwaysVisible) {
// Despite the fact that base method matches the ref-qualifier better,
// completion results should only include the derived method.
auto Completions = completions(R"cpp(
struct deque_base {
float size();
double size() const;
};
struct deque : deque_base {
int size() const;
};
auto x = deque().^
)cpp")
.Completions;
EXPECT_THAT(Completions,
ElementsAre(AllOf(ReturnType("int"), Named("size"))));
}
TEST(NoCompileCompletionTest, Basic) {
auto Results = completionsNoCompile(R"cpp(
void func() {

3
clang/lib/Sema/SemaCodeComplete.cpp
View File

@ -1185,6 +1185,9 @@ static OverloadCompare compareOverloads(const CXXMethodDecl &Candidate,
const CXXMethodDecl &Incumbent,
const Qualifiers &ObjectQuals,
ExprValueKind ObjectKind) {
// Base/derived shadowing is handled elsewhere.
if (Candidate.getDeclContext() != Incumbent.getDeclContext())
return OverloadCompare::BothViable;
if (Candidate.isVariadic() != Incumbent.isVariadic() ||
Candidate.getNumParams() != Incumbent.getNumParams() ||
Candidate.getMinRequiredArguments() !=

13
clang/test/CodeCompletion/member-access-qualifiers.cpp Normal file
View File

@ -0,0 +1,13 @@
struct deque_base {
int &size();
const int &size() const;
};
struct deque : private deque_base {
int size() const;
};
auto x = deque().
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:10:18 %s -o - | FileCheck %s
// CHECK: COMPLETION: size : [#int#]size()[# const#]
// CHECK: COMPLETION: size (Hidden,InBase,Inaccessible) : [#int &#]deque_base::size()