diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-03-01 19:28:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 19:28:13 +0900 |
| commit | 98016962148fdd22ea0b3566450dcdff46bc08b8 (patch) | |
| tree | 97412ac0f23ba442c8bff4bd8515009f8b237643 | |
| parent | 680a0e1dd54db676c64d33a13383335436671659 (diff) | |
| parent | febf72861bf00599225250c9d2550a1c4eddbd08 (diff) | |
| download | rust-98016962148fdd22ea0b3566450dcdff46bc08b8.tar.gz rust-98016962148fdd22ea0b3566450dcdff46bc08b8.zip | |
Rollup merge of #69583 - LeSeulArtichaut:ice-69378, r=Centril
Do not ICE on invalid type node after parse recovery Closes #69378. r? @estebank
3 files changed, 18 insertions, 0 deletions
diff --git a/src/librustc_typeck/check/expr.rs b/src/librustc_typeck/check/expr.rs index 124d0f4b731..ff9fec004bb 100644 --- a/src/librustc_typeck/check/expr.rs +++ b/src/librustc_typeck/check/expr.rs @@ -1312,6 +1312,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { ty_span: Span, ) { if variant.recovered { + self.set_tainted_by_errors(); return; } let mut err = self.type_error_struct_with_diag( diff --git a/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.rs b/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.rs new file mode 100644 index 00000000000..571692a5374 --- /dev/null +++ b/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.rs @@ -0,0 +1,9 @@ +// Regression test for #69378: no type for node after struct parse recovery + +struct Foo { 0: u8 } //~ ERROR expected identifier + +fn test(f: Foo) { + Foo{foo: 4, ..f}; +} + +fn main() {} diff --git a/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.stderr b/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.stderr new file mode 100644 index 00000000000..6bc9c8498c9 --- /dev/null +++ b/src/test/ui/typeck/issue-69378-ice-on-invalid-type-node-after-recovery.stderr @@ -0,0 +1,8 @@ +error: expected identifier, found `0` + --> $DIR/issue-69378-ice-on-invalid-type-node-after-recovery.rs:3:14 + | +LL | struct Foo { 0: u8 } + | ^ expected identifier + +error: aborting due to previous error + |