Skip to content

Commit abe3003

Browse files
committed
[AST] Use recovery-expr to preserve incomplete-type-member-access expression.
Fixes clangd/clangd#502 Differential Revision: https://reviews.llvm.org/D116922
1 parent c44d521 commit abe3003

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

clang/lib/Sema/SemaExprCXX.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7410,8 +7410,10 @@ ExprResult Sema::ActOnStartCXXMemberReference(Scope *S, Expr *Base,
74107410
// the member function body.
74117411
if (!BaseType->isDependentType() &&
74127412
!isThisOutsideMemberFunctionBody(BaseType) &&
7413-
RequireCompleteType(OpLoc, BaseType, diag::err_incomplete_member_access))
7414-
return ExprError();
7413+
RequireCompleteType(OpLoc, BaseType,
7414+
diag::err_incomplete_member_access)) {
7415+
return CreateRecoveryExpr(Base->getBeginLoc(), Base->getEndLoc(), {Base});
7416+
}
74157417

74167418
// C++ [basic.lookup.classref]p2:
74177419
// If the id-expression in a class member access (5.2.5) is an

clang/test/AST/ast-dump-recovery.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,16 @@ void test(int x) {
121121
foo->func(x);
122122
}
123123

124+
void AccessIncompleteClass() {
125+
struct Forward;
126+
Forward* ptr;
127+
// CHECK: CallExpr {{.*}} '<dependent type>'
128+
// CHECK-NEXT: `-CXXDependentScopeMemberExpr {{.*}} '<dependent type>'
129+
// CHECK-NEXT: `-RecoveryExpr {{.*}} '<dependent type>' contains-errors
130+
// CHECK-NEXT: `-DeclRefExpr {{.*}} 'Forward *'
131+
ptr->method();
132+
}
133+
124134
struct Foo2 {
125135
double func();
126136
class ForwardClass;

clang/test/OpenMP/declare_reduction_messages.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ struct S
169169
#pragma omp declare reduction (xxx : U, S : bar(omp_in)) // expected-error {{non-const lvalue reference to type 'S<1>' cannot bind to a value of unrelated type 'U'}}
170170
static void bar(S &x); // expected-note {{passing argument to parameter 'x' here}}
171171
};
172-
// expected-warning@+2 {{extra tokens at the end of '#pragma omp declare reduction' are ignored}}
173172
// expected-note@+1 {{in instantiation of template class 'S<1>' requested here}}
174173
#pragma omp declare reduction (bar : S<1> : omp_out.foo(omp_in))
175174

0 commit comments

Comments
 (0)