Skip to content

[clang-repl] fix error recovery while parsing completely fails #127087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2025
Merged

[clang-repl] fix error recovery while parsing completely fails #127087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion clang/lib/Parse/ParseDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6024,7 +6024,7 @@ Parser::DeclGroupPtrTy Parser::ParseTopLevelStmtDecl() {
TopLevelStmtDecl *TLSD = Actions.ActOnStartTopLevelStmtDecl(getCurScope());
StmtResult R = ParseStatementOrDeclaration(Stmts, SubStmtCtx);
if (!R.isUsable())
return nullptr;
R = Actions.ActOnNullStmt(Tok.getLocation());

Actions.ActOnFinishTopLevelStmtDecl(TLSD, R.get());

Expand Down
7 changes: 7 additions & 0 deletions clang/unittests/Interpreter/InterpreterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ TEST_F(InterpreterTest, Errors) {

auto RecoverErr = Interp->Parse("int var1 = 42;");
EXPECT_TRUE(!!RecoverErr);

Err = Interp->Parse("try { throw 1; } catch { 0; }").takeError();
EXPECT_THAT(DiagnosticOutput, HasSubstr("error: expected '('"));
EXPECT_EQ("Parsing failed.", llvm::toString(std::move(Err)));

RecoverErr = Interp->Parse("var1 = 424;");
EXPECT_TRUE(!!RecoverErr);
}

// Here we test whether the user can mix declarations and statements. The
Expand Down