[PATCH] D81163: [AST][RecoveryExpr] Preserve the AST for invalid conditions.
Haojian Wu via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Fri Jun 12 08:41:05 PDT 2020
hokein updated this revision to Diff 270413.
hokein added a comment.
rebase and adjust the test.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D81163/new/
https://reviews.llvm.org/D81163
Files:
clang/lib/Sema/SemaExpr.cpp
clang/test/AST/ast-dump-recovery.cpp
clang/test/SemaTemplate/instantiate-expr-3.cpp
Index: clang/test/SemaTemplate/instantiate-expr-3.cpp
===================================================================
--- clang/test/SemaTemplate/instantiate-expr-3.cpp
+++ clang/test/SemaTemplate/instantiate-expr-3.cpp
@@ -65,7 +65,7 @@
void f(T t) {
(void)({
if (t) // expected-error{{contextually convertible}}
- t = t + 17;
+ t = t + 17; // expected-error {{invalid operands to binary expression ('N1::X' and 'int')}}
t + 12; // expected-error{{invalid operands}}
});
}
Index: clang/test/AST/ast-dump-recovery.cpp
===================================================================
--- clang/test/AST/ast-dump-recovery.cpp
+++ clang/test/AST/ast-dump-recovery.cpp
@@ -211,3 +211,30 @@
} NoCrashOnInvalidInitList = {
.abc = nullptr,
};
+
+void InvalidCondition() {
+ // CHECK: IfStmt {{.*}}
+ // CHECK-NEXT: |-RecoveryExpr {{.*}} <col:7, col:15> '<dependent type>' contains-errors
+ // CHECK-NEXT: | `-UnresolvedLookupExpr {{.*}} <col:7>
+ if (invalid()) {}
+
+ // CHECK: WhileStmt {{.*}}
+ // CHECK-NEXT: |-RecoveryExpr {{.*}} <col:10, col:18> '<dependent type>' contains-errors
+ // CHECK-NEXT: | `-UnresolvedLookupExpr {{.*}} <col:10>
+ while (invalid()) {}
+
+ // CHECK: SwitchStmt {{.*}}
+ // CHECK-NEXT: |-RecoveryExpr {{.*}} '<dependent type>' contains-errors
+ // CHECK-NEXT: | `-UnresolvedLookupExpr {{.*}} <col:10>
+ switch(invalid()) {
+ case 1:
+ break;
+ }
+ // FIXME: figure out why the type of ConditionalOperator is not int.
+ // CHECK: ConditionalOperator {{.*}} '<dependent type>' contains-errors
+ // CHECK-NEXT: |-RecoveryExpr {{.*}} '<dependent type>' contains-errors
+ // CHECK-NEXT: | `-UnresolvedLookupExpr {{.*}}
+ // CHECK-NEXT: |-IntegerLiteral {{.*}} 'int' 1
+ // CHECK-NEXT: `-IntegerLiteral {{.*}} 'int' 2
+ invalid() ? 1 : 2;
+}
Index: clang/lib/Sema/SemaExpr.cpp
===================================================================
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -18466,9 +18466,12 @@
Cond = CheckSwitchCondition(Loc, SubExpr);
break;
}
- if (Cond.isInvalid())
- return ConditionError();
-
+ if (Cond.isInvalid()) {
+ Cond = CreateRecoveryExpr(SubExpr->getBeginLoc(), SubExpr->getEndLoc(),
+ {SubExpr});
+ if (!Cond.get())
+ return ConditionError();
+ }
// FIXME: FullExprArg doesn't have an invalid bit, so check nullness instead.
FullExprArg FullExpr = MakeFullExpr(Cond.get(), Loc);
if (!FullExpr.get())
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D81163.270413.patch
Type: text/x-patch
Size: 2556 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200612/f2fa9c96/attachment.bin>
More information about the cfe-commits
mailing list