This is an archive of the discontinued LLVM Phabricator instance.

Differential D76764

[AST] Build recovery expressions for nonexistent member exprs.
ClosedPublic

Authored by hokein on Mar 25 2020, 4:48 AM.

Details

Reviewers
sammccall
Commits
rGa9ab11d40830: [AST] Build recovery expressions for nonexistent member exprs.
Summary

Previously, we dropped the AST node for nonexistent member exprs.

Diff Detail

Unit TestsFailed

TimeTest
50 msClangd Unit Tests._/ClangdTests_exe::Unknown Unit Message ("")

Event Timeline

hokein created this revision.Mar 25 2020, 4:48 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 25 2020, 4:48 AM
sammccall accepted this revision.Mar 25 2020, 5:22 AM

Nice!

clang/lib/Parse/ParseExpr.cpp
2107

preserve the LHS if the RHS is an invalid member?

This revision is now accepted and ready to land.Mar 25 2020, 5:22 AM
Harbormaster failed remote builds in B50378: Diff 252541!Mar 25 2020, 6:27 AM
hokein updated this revision to Diff 252559.Mar 25 2020, 6:45 AM
hokein marked an inline comment as done.

address comment and fix a failing testcase.

Herald added subscribers: usaxena95, kadircet, arphaman, jkorous. · View Herald TranscriptMar 25 2020, 6:45 AM
Harbormaster failed remote builds in B50385: Diff 252559!Mar 25 2020, 8:04 AM
Closed by commit rGa9ab11d40830: [AST] Build recovery expressions for nonexistent member exprs. (authored by hokein). · Explain WhyMar 26 2020, 1:03 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Parse/
10 lines
test/
AST/
15 lines
SemaCXX/
2 lines

Diff 252541

clang/lib/Parse/ParseExpr.cpp

Show First 20 Lines • Show All 2,094 Lines • ▼ Show 20 Lines case tok::period: {
LHS = ExprError(); LHS = ExprError();
} }
if (!LHS.isInvalid()) if (!LHS.isInvalid())
LHS = Actions.ActOnMemberAccessExpr(getCurScope(), LHS.get(), OpLoc, LHS = Actions.ActOnMemberAccessExpr(getCurScope(), LHS.get(), OpLoc,
OpKind, SS, TemplateKWLoc, Name, OpKind, SS, TemplateKWLoc, Name,
CurParsedObjCImpl ? CurParsedObjCImpl->Dcl CurParsedObjCImpl ? CurParsedObjCImpl->Dcl
: nullptr); : nullptr);
if (!LHS.isInvalid() && Tok.is(tok::less)) if (!LHS.isInvalid()) {
if (Tok.is(tok::less))
checkPotentialAngleBracket(LHS); checkPotentialAngleBracket(LHS);
} else if (OrigLHS && Name.isValid()) {
// Preserve the member expr if the LHS is an invalid members.
sammccallUnsubmitted
Done
ReplyInline Actions

preserve the LHS if the RHS is an invalid member?

sammccall: preserve the LHS if the RHS is an invalid member?
LHS = Actions.CreateRecoveryExpr(OrigLHS->getBeginLoc(),
Name.getEndLoc(), {OrigLHS});
}
break; break;
} }
case tok::plusplus: // postfix-expression: postfix-expression '++' case tok::plusplus: // postfix-expression: postfix-expression '++'
case tok::minusminus: // postfix-expression: postfix-expression '--' case tok::minusminus: // postfix-expression: postfix-expression '--'
if (!LHS.isInvalid()) { if (!LHS.isInvalid()) {
Expr *Arg = LHS.get(); Expr *Arg = LHS.get();
LHS = Actions.ActOnPostfixUnaryOp(getCurScope(), Tok.getLocation(), LHS = Actions.ActOnPostfixUnaryOp(getCurScope(), Tok.getLocation(),
Tok.getKind(), Arg); Tok.getKind(), Arg);
▲ Show 20 Lines • Show All 1,389 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Lines
// CHECK: VarDecl {{.*}} ternary // CHECK: VarDecl {{.*}} ternary
// CHECK-NEXT:`-RecoveryExpr {{.*}} contains-errors // CHECK-NEXT:`-RecoveryExpr {{.*}} contains-errors
// CHECK-NEXT: |-DeclRefExpr {{.*}} 'a' // CHECK-NEXT: |-DeclRefExpr {{.*}} 'a'
// CHECK-NEXT: |-CXXNullPtrLiteralExpr // CHECK-NEXT: |-CXXNullPtrLiteralExpr
// CHECK-NEXT: `-DeclRefExpr {{.*}} 'a' // CHECK-NEXT: `-DeclRefExpr {{.*}} 'a'
// DISABLED-NOT: -RecoveryExpr {{.*}} contains-errors // DISABLED-NOT: -RecoveryExpr {{.*}} contains-errors
int ternary = a ? nullptr : a; int ternary = a ? nullptr : a;
// CHECK: FunctionDecl
// CHECK-NEXT:|-ParmVarDecl {{.*}} x
// CHECK-NEXT:`-CompoundStmt
// CHECK-NEXT: |-RecoveryExpr {{.*}} contains-errors
// CHECK-NEXT: | `-DeclRefExpr {{.*}} 'foo'
// CHECK-NEXT: `-CallExpr {{.*}} contains-errors
// CHECK-NEXT: |-RecoveryExpr {{.*}} contains-errors
// CHECK-NEXT: | `-DeclRefExpr {{.*}} 'foo'
// CHECK-NEXT: `-DeclRefExpr {{.*}} 'x'
struct Foo {} foo;
void test(int x) {
foo.abc;
foo->func(x);
}
No newline at end of file

clang/test/SemaCXX/constructor-initializer.cpp

Show First 20 Lines • Show All 244 Lines • ▼ Show 20 Lines
#endif #endif
// expected-note@-5 {{candidate constructor (the implicit default constructor) not viable}} // expected-note@-5 {{candidate constructor (the implicit default constructor) not viable}}
class B : public A { class B : public A {
public: public:
B(const String& s, int e=0) // expected-error {{unknown type name}} B(const String& s, int e=0) // expected-error {{unknown type name}}
: A(e), m_String(s) , m_ErrorStr(__null) {} // expected-error {{no matching constructor}} expected-error {{does not name}} : A(e), m_String(s) , m_ErrorStr(__null) {} // expected-error {{no matching constructor}} expected-error {{does not name}}
B(const B& e) B(const B& e)
: A(e), m_String(e.m_String), m_ErrorStr(__null) { // expected-error {{does not name}} \ : A(e), m_String(e.m_String), m_ErrorStr(__null) { // expected-error 2{{does not name}} \
// expected-error {{no member named 'm_String' in 'test3::B'}} // expected-error {{no member named 'm_String' in 'test3::B'}}
} }
}; };
} }
// PR8075 // PR8075
namespace PR8075 { namespace PR8075 {
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines