diff options
author | yronglin <yronglin777@gmail.com> | 2023-09-09 00:48:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-09 00:48:06 +0800 |
commit | 3cfdef37155d1f0e5b32abe7c84e8304ef77ca10 (patch) | |
tree | fbfcae60593175ed46a12c46bf5e4f3315ddcd36 /clang/lib/Parse/ParseStmt.cpp | |
parent | 123bf084029e4d35420a95e47ddd332d24c23a6d (diff) | |
download | llvm-3cfdef37155d1f0e5b32abe7c84e8304ef77ca10.zip llvm-3cfdef37155d1f0e5b32abe7c84e8304ef77ca10.tar.gz llvm-3cfdef37155d1f0e5b32abe7c84e8304ef77ca10.tar.bz2 |
[Clang] Fix the for statement disappearing in AST when an error occurs in the conditional expression of the for statement (#65381)
Consider:
```
constexpr int f() {
int sum = 0;
for (int i = 0; undefined_var; ++i) {
sum += i;
}
return sum;
}
static_assert(f());
```
The AST before this patch:
```
|-FunctionDecl <line:1:1, line:7:1> line:1:15 used constexpr f 'int ()' implicit-inline
| `-CompoundStmt <col:19, line:7:1>
| |-DeclStmt <line:2:5, col:16>
| | `-VarDecl <col:5, col:15> col:9 used sum 'int' cinit
| | `-IntegerLiteral <col:15> 'int' 0
| `-ReturnStmt <line:6:5, col:12>
| `-ImplicitCastExpr <col:12> 'int' <LValueToRValue>
| `-DeclRefExpr <col:12> 'int' lvalue Var 0xb870518 'sum' 'int'
```
The AST after this patch:
```
|-FunctionDecl 0x11d0f63f8 <./main.cpp:1:1, line:7:1> line:1:15 used constexpr f 'int ()' implicit-inline
| `-CompoundStmt 0x11d110880 <col:19, line:7:1>
| |-DeclStmt 0x11d0f65c8 <line:2:5, col:16>
| | `-VarDecl 0x11d0f6528 <col:5, col:15> col:9 used sum 'int' cinit
| | `-IntegerLiteral 0x11d0f6590 <col:15> 'int' 0
| |-ForStmt 0x11d110800 <line:3:5, line:5:5>
| | |-DeclStmt 0x11d0f66a0 <line:3:10, col:19>
| | | `-VarDecl 0x11d0f6600 <col:10, col:18> col:14 used i 'int' cinit
| | | `-IntegerLiteral 0x11d0f6668 <col:18> 'int' 0
| | |-<<<NULL>>>
| | |-RecoveryExpr 0x11d0f66e8 <col:21> 'bool' contains-errors
| | |-UnaryOperator 0x11d0f6728 <col:36, col:38> 'int' lvalue prefix '++'
| | | `-DeclRefExpr 0x11d0f6708 <col:38> 'int' lvalue Var 0x11d0f6600 'i' 'int'
| | `-CompoundStmt 0x11d0f67c8 <col:41, line:5:5>
| | `-CompoundAssignOperator 0x11d0f6798 <line:4:9, col:16> 'int' lvalue '+=' ComputeLHSTy='int' ComputeResultTy='int'
| | |-DeclRefExpr 0x11d0f6740 <col:9> 'int' lvalue Var 0x11d0f6528 'sum' 'int'
| | `-ImplicitCastExpr 0x11d0f6780 <col:16> 'int' <LValueToRValue>
| | `-DeclRefExpr 0x11d0f6760 <col:16> 'int' lvalue Var 0x11d0f6600 'i' 'int'
| `-ReturnStmt 0x11d110870 <line:6:5, col:12>
| `-ImplicitCastExpr 0x11d110858 <col:12> 'int' <LValueToRValue>
| `-DeclRefExpr 0x11d110838 <col:12> 'int' lvalue Var 0x11d0f6528 'sum' 'int'
```
---------
Co-authored-by: Shafik Yaghmour <shafik@users.noreply.github.com>
Diffstat (limited to 'clang/lib/Parse/ParseStmt.cpp')
-rw-r--r-- | clang/lib/Parse/ParseStmt.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp index 110806e..fb883c0 100644 --- a/clang/lib/Parse/ParseStmt.cpp +++ b/clang/lib/Parse/ParseStmt.cpp @@ -2158,11 +2158,13 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) { // for-range-declaration next. bool MightBeForRangeStmt = !ForRangeInfo.ParsedForRangeDecl(); ColonProtectionRAIIObject ColonProtection(*this, MightBeForRangeStmt); + SourceLocation SecondPartStart = Tok.getLocation(); + Sema::ConditionKind CK = Sema::ConditionKind::Boolean; SecondPart = ParseCXXCondition( - nullptr, ForLoc, Sema::ConditionKind::Boolean, + /*InitStmt=*/nullptr, ForLoc, CK, // FIXME: recovery if we don't see another semi! /*MissingOK=*/true, MightBeForRangeStmt ? &ForRangeInfo : nullptr, - /*EnterForConditionScope*/ true); + /*EnterForConditionScope=*/true); if (ForRangeInfo.ParsedForRangeDecl()) { Diag(FirstPart.get() ? FirstPart.get()->getBeginLoc() @@ -2178,6 +2180,19 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) { << FixItHint::CreateRemoval(EmptyInitStmtSemiLoc); } } + + if (SecondPart.isInvalid()) { + ExprResult CondExpr = Actions.CreateRecoveryExpr( + SecondPartStart, + Tok.getLocation() == SecondPartStart ? SecondPartStart + : PrevTokLocation, + {}, Actions.PreferredConditionType(CK)); + if (!CondExpr.isInvalid()) + SecondPart = Actions.ActOnCondition(getCurScope(), ForLoc, + CondExpr.get(), CK, + /*MissingOK=*/false); + } + } else { // We permit 'continue' and 'break' in the condition of a for loop. getCurScope()->AddFlags(Scope::BreakScope | Scope::ContinueScope); |