Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions clang/lib/Sema/SemaCodeComplete.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5796,24 +5796,11 @@ QualType getApproximateType(const Expr *E, HeuristicResolver &Resolver) {
return QualType(Common, 0);
}
}
// A dependent member: approximate-resolve the base, then lookup.
// A dependent member: resolve using HeuristicResolver.
if (const auto *CDSME = llvm::dyn_cast<CXXDependentScopeMemberExpr>(E)) {
QualType Base = CDSME->isImplicitAccess()
? CDSME->getBaseType()
: getApproximateType(CDSME->getBase(), Resolver);
if (CDSME->isArrow() && !Base.isNull())
Base = Base->getPointeeType(); // could handle unique_ptr etc here?
auto *RD =
Base.isNull()
? nullptr
: llvm::dyn_cast_or_null<CXXRecordDecl>(getAsRecordDecl(Base));
if (RD && RD->isCompleteDefinition()) {
// Look up member heuristically, including in bases.
for (const auto *Member : RD->lookupDependentName(
CDSME->getMember(), [](const NamedDecl *Member) {
return llvm::isa<ValueDecl>(Member);
})) {
return llvm::cast<ValueDecl>(Member)->getType().getNonReferenceType();
for (const auto *Member : Resolver.resolveMemberExpr(CDSME)) {
if (const auto *VD = dyn_cast<ValueDecl>(Member)) {
return VD->getType().getNonReferenceType();
}
}
}
Expand Down
Loading