Do not ICE in the face of invalid enum discriminant #69903

estebank · 2020-03-10T23:25:12Z

Fix #67377.

r? @pnkfelix

estebank · 2020-03-10T23:27:02Z

I don't think this is the best way of doing it, but it is certainly a way to mitigate the issues.

Centril · 2020-03-10T23:39:29Z

cc @oli-obk

oli-obk · 2020-03-11T11:45:43Z

src/librustc_mir_build/hair/cx/expr.rs

                    fields: vec![],
                    base: None,
                },
+                _ if ty.references_error() => {
+                    // Handle degenerate input without ICE (#67377).
+                    ExprKind::Literal { literal: ty::Const::zero_sized(cx.tcx, ty), user_ty: None }


what if you use cx.tcx.types.err instead of ty here? That should avoid the TooGeneric and instead give us an AlreadyReported

Pushing that change as it is reasonable, but there's no change in the output. Could there be a better placeholder than ExprKind::Literal or ty::Const::zero_sized?

What do you mean by "change in the output"? If you change the delay_span_bug back to span_bug, will it still get triggered? I don't actually expect any stderr changes.

ping @estebank did you have a chance to try this?

Made the requested change, reverting delay_span_bug change and making ty types.err. The span_bug triggers.

Thanks for trying! I guess at this point in parser recovery we just have to give up.

estebank · 2020-03-11T16:52:22Z

r? @oli-obk

oli-obk · 2020-04-14T15:13:44Z

@bors r+

bors · 2020-04-14T15:13:45Z

📌 Commit 187f270 has been approved by oli-obk

@pnkfelix

Do not ICE in the face of invalid enum discriminant Fix rust-lang#67377. r? @pnkfelix

Centril · 2020-04-15T07:10:28Z

Failed in #71161 (comment), @bors r-

estebank · 2020-04-15T17:24:42Z

@bors r=oli-obk rebased and reblessed

bors · 2020-04-15T17:24:43Z

📌 Commit f47c4ff has been approved by oli-obk

bors · 2020-04-15T17:24:44Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@pnkfelix

Do not ICE in the face of invalid enum discriminant Fix rust-lang#67377. r? @pnkfelix

@ghost

Rollup of 6 pull requests Successful merges: - rust-lang#69903 (Do not ICE in the face of invalid enum discriminant) - rust-lang#70354 (Update RELEASES.md for 1.43.0) - rust-lang#70774 (End cleanup on rustdoc-js tools) - rust-lang#70990 (Improve rustdoc source code a bit) - rust-lang#71145 (Add illumos triple) - rust-lang#71166 (Clean up E0518 explanation) Failed merges: r? @ghost

eddyb · 2020-04-16T10:28:36Z

src/librustc_mir_build/hair/cx/expr.rs

+                _ if ty.references_error() => {
+                    // Handle degenerate input without ICE (#67377).
+                    ExprKind::Literal {
+                        literal: ty::Const::zero_sized(cx.tcx, cx.tcx.types.err),


Please use tcx.consts.err, doing it this way makes it slip past #71049, had I not come across this PR for a completely unrelated reason.

Wait how are we even getting here?! MIR isn't built if typeck_tables_of(def_id).is_tainted_by_errors and that's where ty comes from.

eddyb · 2020-04-16T10:35:15Z

src/librustc_middle/ty/mod.rs

            Err(ErrorHandled::TooGeneric) => {
-                span_bug!(tcx.def_span(expr_did), "enum discriminant depends on generic arguments",)
+                tcx.sess.delay_span_bug(
+                    tcx.def_span(expr_did),
+                    "enum discriminant depends on generic arguments",
+                );
+                None


This must be the actual change here, and it looks a lot like the "ty: use delay_span_bug in ty::AdtDef::eval_explicit_discr." commit from #70825.

rust-highfive assigned pnkfelix Mar 10, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2020

oli-obk reviewed Mar 11, 2020

View reviewed changes

rust-highfive assigned oli-obk and unassigned pnkfelix Mar 11, 2020

This comment has been minimized.

Sign in to view

oli-obk added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 2, 2020

estebank force-pushed the icemation branch from 0319cdb to 187f270 Compare April 10, 2020 02:27

estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 14, 2020

Centril added a commit to Centril/rust that referenced this pull request Apr 15, 2020

Rollup merge of rust-lang#69903 - estebank:icemation, r=oli-obk

02e1a74

Do not ICE in the face of invalid enum discriminant Fix rust-lang#67377. r? @pnkfelix

Centril mentioned this pull request Apr 15, 2020

Rollup of 5 pull requests #71161

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 15, 2020

Do not ICE in the face of invalid enum discriminant

f47c4ff

estebank force-pushed the icemation branch from 187f270 to f47c4ff Compare April 15, 2020 17:24

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 15, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 15, 2020

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 15, 2020

Rollup merge of rust-lang#69903 - estebank:icemation, r=oli-obk

2230004

Do not ICE in the face of invalid enum discriminant Fix rust-lang#67377. r? @pnkfelix

This was referenced Apr 15, 2020

Rollup of 4 pull requests #71175

Closed

Rollup of 6 pull requests #71180

Merged

bors merged commit 03707b5 into rust-lang:master Apr 16, 2020

eddyb reviewed Apr 16, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Do not ICE in the face of invalid enum discriminant #69903

Do not ICE in the face of invalid enum discriminant #69903

estebank commented Mar 10, 2020

estebank commented Mar 10, 2020

Centril commented Mar 10, 2020

oli-obk Mar 11, 2020

estebank Mar 11, 2020

oli-obk Mar 12, 2020

oli-obk Apr 2, 2020

estebank Apr 10, 2020

oli-obk Apr 14, 2020

estebank commented Mar 11, 2020

This comment has been minimized.

oli-obk commented Apr 14, 2020

bors commented Apr 14, 2020

Centril commented Apr 15, 2020

estebank commented Apr 15, 2020

bors commented Apr 15, 2020

bors commented Apr 15, 2020

eddyb Apr 16, 2020

eddyb Apr 16, 2020

eddyb Apr 16, 2020 •

edited

Loading

estebank Apr 19, 2020

Do not ICE in the face of invalid enum discriminant #69903

Do not ICE in the face of invalid enum discriminant #69903

Conversation

estebank commented Mar 10, 2020

estebank commented Mar 10, 2020

Centril commented Mar 10, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

estebank commented Mar 11, 2020

This comment has been minimized.

oli-obk commented Apr 14, 2020

bors commented Apr 14, 2020

Centril commented Apr 15, 2020

estebank commented Apr 15, 2020

bors commented Apr 15, 2020

bors commented Apr 15, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddyb Apr 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddyb Apr 16, 2020 •

edited

Loading