rustc_driver: Catch ICEs on the main thread too #49826

cuviper · 2018-04-10T00:37:54Z

#48575 introduced an optimization to run rustc directly on the main thread when possible. However, the threaded code detects panics when they join() to report as an ICE. When running directly, we need to use panic::catch_unwind to get the same effect.

cc @ishitatsuyuki
r? @alexcrichton

alexcrichton · 2018-04-10T14:08:18Z

@bors: r+

Thanks!

bors · 2018-04-10T14:08:19Z

📌 Commit 6742795 has been approved by alexcrichton

kennytm · 2018-04-11T19:22:29Z

This seems to cause rollup to fail in #49875 (comment) after merging with the latest master. Could you verify if this is the case after rebasing?

cuviper · 2018-04-11T19:34:16Z

I will verify, but I doubt this would cause such a problem. The only difference should be whether a compiler panic also reports the ICE message.

cuviper · 2018-04-11T20:19:57Z

Weird! That test is fine on master (two expected errors and a clean exit), but it does indeed panic with just my patch rebased on top. I really don't understand why!

$ RUST_BACKTRACE=1 rustc +dev2 -Z continue-parse-after-error src/test/compile-fail/issue-36638.rs
error: expected identifier, found keyword `Self`
  --> src/test/compile-fail/issue-36638.rs:13:12
   |
13 | struct Foo<Self>(Self);
   |            ^^^^ expected identifier, found keyword

error: expected identifier, found keyword `Self`
  --> src/test/compile-fail/issue-36638.rs:16:11
   |
16 | trait Bar<Self> {}
   |           ^^^^ expected identifier, found keyword

thread 'main' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`', librustc/ty/sty.rs:889:13
stack backtrace:
   0: std::sys::unix::backtrace::tracing::imp::unwind_backtrace
   1: std::sys_common::backtrace::print
   2: std::panicking::default_hook::{{closure}}
   3: std::panicking::default_hook
   4: rustc::util::common::panic_hook
   5: std::panicking::rust_panic_with_hook
   6: std::panicking::begin_panic_fmt
   7: rustc::ty::sty::ParamTy::is_self
   8: rustc::ty::flags::FlagComputation::for_sty
   9: rustc::ty::context::CtxtInterners::intern_ty
  10: rustc::ty::subst::<impl rustc::ty::Slice<rustc::ty::subst::Kind<'tcx>>>::fill_item
  11: rustc::ty::subst::<impl rustc::ty::Slice<rustc::ty::subst::Kind<'tcx>>>::identity_for_item
  12: rustc_typeck::collect::predicates_of
  13: rustc::ty::maps::<impl rustc::ty::maps::queries::predicates_of<'tcx>>::compute_result
  14: rustc::dep_graph::graph::DepGraph::with_task_impl
  15: rustc::ty::context::tls::with_related_context
  16: rustc::ty::maps::<impl rustc::ty::maps::queries::predicates_of<'tcx>>::force_with_lock
  17: rustc::ty::maps::<impl rustc::ty::maps::queries::predicates_of<'tcx>>::try_get
  18: rustc::ty::maps::TyCtxtAt::predicates_of
  19: rustc::ty::maps::<impl rustc::ty::context::TyCtxt<'a, 'tcx, 'lcx>>::predicates_of
  20: <rustc_typeck::collect::CollectItemTypesVisitor<'a, 'tcx> as rustc::hir::intravisit::Visitor<'tcx>>::visit_item
  21: rustc::hir::Crate::visit_all_item_likes
  22: rustc::session::Session::track_errors
  23: rustc_typeck::check_crate
  24: rustc::ty::context::tls::enter_context
  25: <std::thread::local::LocalKey<T>>::with
  26: rustc::ty::context::TyCtxt::create_and_enter
  27: rustc_driver::driver::compile_input
  28: rustc_driver::run_compiler_impl
  29: syntax::with_globals
  30: std::panicking::try::do_call
  31: __rust_maybe_catch_panic
  32: rustc_driver::main
  33: std::rt::lang_start::{{closure}}
  34: std::panicking::try::do_call
  35: __rust_maybe_catch_panic
  36: std::rt::lang_start_internal
  37: main
  38: __libc_start_main
  39: _start
query stack during panic:
#0 [predicates_of] processing `Bar`
  --> src/test/compile-fail/issue-36638.rs:16:1
   |
16 | trait Bar<Self> {}
   | ^^^^^^^^^^^^^^^
end of query stack
error: aborting due to 2 previous errors


error: internal compiler error: unexpected panic

note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports

note: rustc 1.27.0-dev running on x86_64-unknown-linux-gnu

note: compiler flags: -Z continue-parse-after-error

kennytm · 2018-04-11T20:25:49Z

Thanks for verification! Let me take this off the queue first then.

@bors r-

cuviper · 2018-04-11T20:49:57Z

That test is fine on master (two expected errors and a clean exit),

I take that back! The test does "pass" on master, but wrongly so -- it's not actually clean.

In compiletest's check_no_compiler_crash it only looks for "error: internal compiler error". Before my patch, you get the panic without the ICE message, so the crash is not noticed!

$ RUST_BACKTRACE=1 rustc +dev2 -Z continue-parse-after-error src/test/compile-fail/issue-36638.rs
error: expected identifier, found keyword `Self`
  --> src/test/compile-fail/issue-36638.rs:13:12
   |
13 | struct Foo<Self>(Self);
   |            ^^^^ expected identifier, found keyword

error: expected identifier, found keyword `Self`
  --> src/test/compile-fail/issue-36638.rs:16:11
   |
16 | trait Bar<Self> {}
   |           ^^^^ expected identifier, found keyword

thread 'main' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`', librustc/ty/sty.rs:889:13
stack backtrace:
   0: std::sys::unix::backtrace::tracing::imp::unwind_backtrace
   1: std::sys_common::backtrace::print
   2: std::panicking::default_hook::{{closure}}
   3: std::panicking::default_hook
   4: rustc::util::common::panic_hook
   5: std::panicking::rust_panic_with_hook
   6: std::panicking::begin_panic_fmt
   7: rustc::ty::sty::ParamTy::is_self
   8: rustc::ty::flags::FlagComputation::for_sty
   9: rustc::ty::context::CtxtInterners::intern_ty
  10: rustc::ty::subst::<impl rustc::ty::Slice<rustc::ty::subst::Kind<'tcx>>>::fill_item
  11: rustc::ty::subst::<impl rustc::ty::Slice<rustc::ty::subst::Kind<'tcx>>>::identity_for_item
  12: rustc_typeck::collect::predicates_of
  13: rustc::ty::maps::<impl rustc::ty::maps::queries::predicates_of<'tcx>>::compute_result
  14: rustc::dep_graph::graph::DepGraph::with_task_impl
  15: rustc::ty::context::tls::with_related_context
  16: rustc::ty::maps::<impl rustc::ty::maps::queries::predicates_of<'tcx>>::force_with_lock
  17: rustc::ty::maps::<impl rustc::ty::maps::queries::predicates_of<'tcx>>::try_get
  18: rustc::ty::maps::TyCtxtAt::predicates_of
  19: rustc::ty::maps::<impl rustc::ty::context::TyCtxt<'a, 'tcx, 'lcx>>::predicates_of
  20: <rustc_typeck::collect::CollectItemTypesVisitor<'a, 'tcx> as rustc::hir::intravisit::Visitor<'tcx>>::visit_item
  21: rustc::hir::Crate::visit_all_item_likes
  22: rustc::session::Session::track_errors
  23: rustc_typeck::check_crate
  24: rustc::ty::context::tls::enter_context
  25: <std::thread::local::LocalKey<T>>::with
  26: rustc::ty::context::TyCtxt::create_and_enter
  27: rustc_driver::driver::compile_input
  28: rustc_driver::run_compiler_impl
  29: syntax::with_globals
  30: rustc_driver::main
  31: std::rt::lang_start::{{closure}}
  32: std::panicking::try::do_call
  33: __rust_maybe_catch_panic
  34: std::rt::lang_start_internal
  35: main
  36: __libc_start_main
  37: _start
query stack during panic:
#0 [predicates_of] processing `Bar`
  --> src/test/compile-fail/issue-36638.rs:16:1
   |
16 | trait Bar<Self> {}
   | ^^^^^^^^^^^^^^^
end of query stack
error: aborting due to 2 previous errors

abonander · 2018-04-19T23:07:24Z

Is there something blocking this? compiletest is eating ICEs in other compile-fail tests as well.

cuviper · 2018-04-20T00:11:43Z

It won't pass CI until #49889 is fixed, at least.

cuviper · 2018-04-27T22:40:10Z

Rebased now that #49891 is merged, including its fixes for the failures that had snuck into the tree.

alexcrichton · 2018-04-27T22:48:55Z

@bors: r+

bors · 2018-04-27T22:48:56Z

📌 Commit 64bcbca has been approved by alexcrichton

bors · 2018-04-28T03:08:20Z

⌛ Testing commit 64bcbca with merge 24d49ea97e9b53a9aa14e67988a6388c6add1494...

bors · 2018-04-28T04:14:07Z

💔 Test failed - status-appveyor

kennytm · 2018-04-28T06:23:51Z

@bors retry #42117

x86_64-msvc-cargo, failed to check out servo/webrender.

testing https://github.com/servo/webrender
Initialized empty Git repository in /c/projects/rust/build/ct/webrender/.git/
fatal: Could not parse object '57250b2b8fa63934f80e5376a29f7dcb3f759ad6'.

bors · 2018-04-28T06:26:52Z

⌛ Testing commit 64bcbca with merge 207bc40...

@ishitatsuyuki

rustc_driver: Catch ICEs on the main thread too #48575 introduced an optimization to run rustc directly on the main thread when possible. However, the threaded code detects panics when they `join()` to report as an ICE. When running directly, we need to use `panic::catch_unwind` to get the same effect. cc @ishitatsuyuki r? @alexcrichton

bors · 2018-04-28T08:53:03Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 207bc40 to master...

rust-highfive assigned alexcrichton Apr 10, 2018

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

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 10, 2018

kennytm mentioned this pull request Apr 11, 2018

Rollup of 14 pull requests #49875

Merged

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 11, 2018

This was referenced Apr 11, 2018

compiletest: check_no_compiler_crash doesn't catch non-ICE panics #49888

Closed

rustc panics on compile-fail/issue-36638 #49889

Closed

cuviper added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 20, 2018

abonander mentioned this pull request Apr 20, 2018

Warn on pointless #[derive] in more places #50092

Merged

rustc_driver: Catch ICEs on the main thread too

64bcbca

cuviper force-pushed the rustc-main-ICE branch from 6742795 to 64bcbca Compare April 27, 2018 22:40

cuviper added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Apr 27, 2018

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 27, 2018

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 27, 2018

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

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 28, 2018

bors merged commit 64bcbca into rust-lang:master Apr 28, 2018

cuviper deleted the rustc-main-ICE branch May 4, 2018 17:13

lqd mentioned this pull request Jul 17, 2019

ICE: Generic type alias to invalid type crashes during type check on latest stable #62742

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustc_driver: Catch ICEs on the main thread too #49826

rustc_driver: Catch ICEs on the main thread too #49826

cuviper commented Apr 10, 2018

alexcrichton commented Apr 10, 2018

bors commented Apr 10, 2018

kennytm commented Apr 11, 2018

cuviper commented Apr 11, 2018

cuviper commented Apr 11, 2018

kennytm commented Apr 11, 2018

cuviper commented Apr 11, 2018

abonander commented Apr 19, 2018

cuviper commented Apr 20, 2018

cuviper commented Apr 27, 2018

alexcrichton commented Apr 27, 2018

bors commented Apr 27, 2018

bors commented Apr 28, 2018

bors commented Apr 28, 2018

kennytm commented Apr 28, 2018 •

edited

Loading

bors commented Apr 28, 2018

bors commented Apr 28, 2018

rustc_driver: Catch ICEs on the main thread too #49826

rustc_driver: Catch ICEs on the main thread too #49826

Conversation

cuviper commented Apr 10, 2018

alexcrichton commented Apr 10, 2018

bors commented Apr 10, 2018

kennytm commented Apr 11, 2018

cuviper commented Apr 11, 2018

cuviper commented Apr 11, 2018

kennytm commented Apr 11, 2018

cuviper commented Apr 11, 2018

abonander commented Apr 19, 2018

cuviper commented Apr 20, 2018

cuviper commented Apr 27, 2018

alexcrichton commented Apr 27, 2018

bors commented Apr 27, 2018

bors commented Apr 28, 2018

bors commented Apr 28, 2018

kennytm commented Apr 28, 2018 • edited Loading

bors commented Apr 28, 2018

bors commented Apr 28, 2018

kennytm commented Apr 28, 2018 •

edited

Loading