Move promoted MIR out of `mir::Body` #63580

wesleywiser · 2019-08-15T02:12:41Z

r? @oli-obk

src/librustc_mir/borrow_check/nll/renumber.rs

src/librustc_mir/transform/mod.rs

src/librustc_mir/transform/promote_consts.rs

src/librustc_codegen_ssa/mir/place.rs

src/librustc_mir/transform/inline.rs

src/librustc_mir/transform/promote_consts.rs

src/librustc_metadata/decoder.rs

src/librustc_metadata/encoder.rs

src/librustc_codegen_ssa/mir/place.rs

oli-obk · 2019-08-17T10:31:23Z

curious, why didn't the failing tests error before? They should have emitted the const_err warning (at least the code looks to me like it should).

Can you adjust the test accordingly?

src/librustc_codegen_ssa/mir/mod.rs

src/librustc_mir/transform/mod.rs

src/librustc_mir/transform/promote_consts.rs

oli-obk · 2019-08-17T14:15:41Z

Awesome. This is ready now, right?

If so, please adjust the PR message

wesleywiser · 2019-08-17T14:21:20Z

I believe so. I'm just waiting for the tests to pass.

oli-obk · 2019-08-17T15:03:59Z

r=me once they do

wesleywiser · 2019-08-17T15:49:54Z

I ran --bless to fix an off-by-one line number

src/test/incremental/hashes/for_loops.rs

oli-obk · 2019-08-17T20:52:03Z

Is that off by one swapping all the time? Maybe there's some ordering that is randomized via a hashmap iteration?

wesleywiser · 2019-08-18T17:24:33Z

Is that off by one swapping all the time? Maybe there's some ordering that is randomized via a hashmap iteration?

I don't think so. I ran the test a bunch of times locally and it consistently failed. I think I just missed adding this change before committing.

src/test/incremental/hashes/function_interfaces.rs

oli-obk · 2019-08-26T01:12:39Z

@bors r+

bors · 2019-08-26T01:12:40Z

📌 Commit d6bf776 has been approved by oli-obk

bors · 2019-08-26T07:48:32Z

⌛ Testing commit d6bf776 with merge 555d7a2...

bors · 2019-08-26T11:29:07Z

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 555d7a2 to master...

rust-highfive · 2019-08-26T11:30:20Z

📣 Toolstate changed by #63580!

Tested on commit 555d7a2.
Direct link to PR: #63580

💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

src/librustc_metadata/decoder.rs

src/librustc/mir/mod.rs

RalfJung · 2019-08-27T06:47:55Z

Looks like this PR causes ICEs when running the Miri test suite with MIR optimizations. To reproduce, build Miri with a rustc including this PR, and run

RUST_BACKTRACE=1 ./miri run-debug tests/run-pass/hashmap.rs -Zmir-opt-level=2

thread 'rustc' panicked at 'index out of bounds: the len is 0 but the index is 0', /rustc/9b91b9c10e3c87ed333a1e34c4f46ed68f1eee06/src/libcore/slice/mod.rs:2715:10

Stacktrace

stack backtrace:
   0: backtrace::backtrace::libunwind::trace
             at /cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.35/src/backtrace/libunwind.rs:88
   1: backtrace::backtrace::trace_unsynchronized
             at /cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.35/src/backtrace/mod.rs:66
   2: std::sys_common::backtrace::_print
             at src/libstd/sys_common/backtrace.rs:47
   3: std::sys_common::backtrace::print
             at src/libstd/sys_common/backtrace.rs:36
   4: std::panicking::default_hook::{{closure}}
             at src/libstd/panicking.rs:200
   5: std::panicking::default_hook
             at src/libstd/panicking.rs:214
   6: rustc::util::common::panic_hook
   7: std::panicking::rust_panic_with_hook
             at src/libstd/panicking.rs:481
   8: std::panicking::continue_panic_fmt
             at src/libstd/panicking.rs:384
   9: rust_begin_unwind
             at src/libstd/panicking.rs:311
  10: core::panicking::panic_fmt
             at src/libcore/panicking.rs:85
  11: core::panicking::panic_bounds_check
             at src/libcore/panicking.rs:61
  12: rustc_mir::interpret::eval_context::InterpCx<M>::load_mir
  13: rustc_mir::const_eval::const_eval_raw_provider
  14: rustc::ty::query::__query_compute::const_eval_raw
  15: rustc::ty::query::<impl rustc::ty::query::config::QueryAccessors for rustc::ty::query::queries::const_eval_raw>::compute
  16: rustc::dep_graph::graph::DepGraph::with_task_impl
  17: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::get_query
  18: rustc_mir::const_eval::const_eval_raw_provider
  19: rustc::ty::query::<impl rustc::ty::query::config::QueryAccessors for rustc::ty::query::queries::const_eval_raw>::compute::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:999
  20: rustc::ty::query::__query_compute::const_eval_raw
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:950
  21: rustc::ty::query::<impl rustc::ty::query::config::QueryAccessors for rustc::ty::query::queries::const_eval_raw>::compute
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:991
  22: rustc::dep_graph::graph::DepGraph::with_task_impl
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/dep_graph/graph.rs:334
  23: rustc::dep_graph::graph::DepGraph::with_task
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/dep_graph/graph.rs:202
  24: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::force_query_with_job::{{closure}}::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:558
  25: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::start_query::{{closure}}::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:277
  26: rustc::ty::context::tls::enter_context::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1847
  27: rustc::ty::context::tls::set_tlv
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1780
  28: rustc::ty::context::tls::enter_context
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1846
  29: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::start_query::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:276
  30: rustc::ty::context::tls::with_related_context::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1953
  31: rustc::ty::context::tls::with_context::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1936
  32: rustc::ty::context::tls::with_context_opt
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1925
  33: rustc::ty::context::tls::with_context
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1936
  34: rustc::ty::context::tls::with_related_context
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1949
  35: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::start_query
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:265
  36: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::force_query_with_job::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:550
  37: rustc::ty::query::plumbing::with_diagnostics
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:210
  38: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::force_query_with_job
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:549
  39: rustc::ty::query::plumbing::<impl rustc::ty::context::TyCtxt>::get_query
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:378
  40: rustc::ty::query::TyCtxtAt::const_eval_raw
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/query/plumbing.rs:1076
  41: rustc_mir::interpret::eval_context::InterpCx<M>::const_eval_raw
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/eval_context.rs:672
  42: rustc_mir::interpret::place::<impl rustc_mir::interpret::eval_context::InterpCx<M>>::eval_static_to_mplace
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/place.rs:590
  43: rustc_mir::interpret::place::<impl rustc_mir::interpret::eval_context::InterpCx<M>>::eval_place::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/place.rs:660
  44: rustc::mir::Place::iterate_over
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/mir/mod.rs:1925
  45: rustc::mir::Place::iterate
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/mir/mod.rs:1892
  46: rustc_mir::interpret::place::<impl rustc_mir::interpret::eval_context::InterpCx<M>>::eval_place
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/place.rs:635
  47: rustc_mir::interpret::step::<impl rustc_mir::interpret::eval_context::InterpCx<M>>::eval_rvalue_into_place
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/step.rs:243
  48: rustc_mir::interpret::step::<impl rustc_mir::interpret::eval_context::InterpCx<M>>::statement
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/step.rs:85
  49: rustc_mir::interpret::step::<impl rustc_mir::interpret::eval_context::InterpCx<M>>::step
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/step.rs:61
  50: rustc_mir::interpret::step::<impl rustc_mir::interpret::eval_context::InterpCx<M>>::run
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_mir/interpret/step.rs:40
  51: miri::eval::eval_main::{{closure}}
             at src/eval.rs:188
  52: miri::eval::eval_main
             at src/eval.rs:187
  53: <miri::MiriCompilerCalls as rustc_driver::Callbacks>::after_analysis::{{closure}}
             at src/bin/miri.rs:52
  54: rustc_interface::passes::BoxedGlobalCtxt::enter::{{closure}}::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_interface/passes.rs:817
  55: rustc::ty::context::tls::enter_global::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1879
  56: rustc::ty::context::tls::enter_context::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1847
  57: rustc::ty::context::tls::set_tlv
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1780
  58: rustc::ty::context::tls::enter_context
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1846
  59: rustc::ty::context::tls::enter_global
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc/ty/context.rs:1878
  60: rustc_interface::passes::BoxedGlobalCtxt::enter::{{closure}}
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_interface/passes.rs:817
  61: rustc_interface::passes::BoxedGlobalCtxt::access::{{closure}}
             at ./<::rustc_data_structures::box_region::declare_box_region_type macros>:21
  62: rustc_interface::passes::create_global_ctxt::{{closure}}
  63: alloc::boxed::<impl core::ops::generator::Generator for core::pin::Pin<alloc::boxed::Box<G>>>::resume
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/liballoc/boxed.rs:1073
  64: rustc_data_structures::box_region::PinnedGenerator<I,A,R>::access
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_data_structures/box_region.rs:52
  65: rustc_interface::passes::BoxedGlobalCtxt::access
             at ./<::rustc_data_structures::box_region::declare_box_region_type macros>:24
  66: rustc_interface::passes::BoxedGlobalCtxt::enter
             at /rustc/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/src/librustc_interface/passes.rs:817
  67: <miri::MiriCompilerCalls as rustc_driver::Callbacks>::after_analysis
             at src/bin/miri.rs:45
  68: rustc_interface::interface::run_compiler_in_existing_thread_pool
  69: std::thread::local::LocalKey<T>::with
  70: scoped_tls::ScopedKey<T>::set
  71: syntax::with_globals
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
query stack during panic:
#0 [const_eval_raw] const-evaluating `main`
#1 [const_eval_raw] const-evaluating `main`
    --> /home/r/.rustup/toolchains/0444b9f66acb5da23dc816e0d8eb59623ba9ea50/lib/rustlib/src/rust/src/libstd/collections/hash/map.rs:2452:9
     |
2452 |         KEYS.with(|keys| {
     |         ^^^^
end of query stack

eddyb · 2019-09-12T05:45:59Z

src/librustc_mir/transform/promote_consts.rs

+
+        //FIXME(oli-obk): having a `maybe_push()` method on `IndexVec` might be nice
+        if let Some(promoted) = promoter.promote_candidate(def_id, candidate, promotions.len()) {
+            promotions.push(promoted);


Pretty sure you can just use extend in such situations.

eddyb · 2019-09-12T05:47:00Z

src/librustc_mir/transform/promote_consts.rs

-        promoter.promote_candidate(candidate);
+
+        //FIXME(oli-obk): having a `maybe_push()` method on `IndexVec` might be nice
+        if let Some(promoted) = promoter.promote_candidate(def_id, candidate, promotions.len()) {


Would be nice to pass the IndexVec key and not an usize here.

rust-highfive assigned oli-obk Aug 15, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 15, 2019

This comment has been minimized.

Sign in to view

oli-obk reviewed Aug 15, 2019

View reviewed changes

This comment has been minimized.

Sign in to view

oli-obk reviewed Aug 15, 2019

View reviewed changes

src/librustc_codegen_ssa/mir/place.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

oli-obk reviewed Aug 17, 2019

View reviewed changes

src/librustc_codegen_ssa/mir/mod.rs Outdated Show resolved Hide resolved

oli-obk reviewed Aug 17, 2019

View reviewed changes

src/librustc_mir/transform/mod.rs Outdated Show resolved Hide resolved

oli-obk reviewed Aug 17, 2019

View reviewed changes

src/librustc_mir/transform/promote_consts.rs Outdated Show resolved Hide resolved

wesleywiser force-pushed the move_promoted_out branch from 8f96a77 to 580b2e2 Compare August 17, 2019 14:07

This comment has been minimized.

Sign in to view

wesleywiser force-pushed the move_promoted_out branch from 580b2e2 to 0278570 Compare August 17, 2019 15:49

This comment has been minimized.

Sign in to view

wesleywiser force-pushed the move_promoted_out branch from 0278570 to da1f679 Compare August 17, 2019 18:03

wesleywiser commented Aug 17, 2019

View reviewed changes

src/test/incremental/hashes/for_loops.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

wesleywiser force-pushed the move_promoted_out branch from da1f679 to 7369726 Compare August 18, 2019 17:23

wesleywiser commented Aug 22, 2019

View reviewed changes

src/test/incremental/hashes/function_interfaces.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

wesleywiser added 3 commits August 22, 2019 06:36

Move 'tcx lifetime on MirPass

666180c

Move promoted out of mir::Body

7381465

Remove eval_promoted const-prop hack

f13faf5

ecstatic-morse mentioned this pull request Aug 24, 2019

Use dataflow to propagate Qualifs during const-qualification #63860

Closed

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 Aug 26, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 26, 2019

bors merged commit d6bf776 into rust-lang:master Aug 26, 2019

bors mentioned this pull request Aug 26, 2019

rustc_metadata: replace Entry table with one table for each of its fields (AoS -> SoA). #59953

Merged

rust-highfive mentioned this pull request Aug 26, 2019

miri no longer builds after rust-lang/rust#63580 #63913

Closed

bjorn3 reviewed Aug 26, 2019

View reviewed changes

src/librustc_metadata/decoder.rs Show resolved Hide resolved

src/librustc/mir/mod.rs Show resolved Hide resolved

src/librustc/mir/mod.rs Show resolved Hide resolved

wesleywiser mentioned this pull request Aug 27, 2019

Resolve some small issues related to #63580 #63933

Merged

This was referenced Aug 27, 2019

Enable MIR optimizations in test suite again rust-lang/miri#480

Closed

rustup rust-lang/miri#926

Merged

Centril mentioned this pull request Aug 29, 2019

Rollup of 11 pull requests #63990

Merged

wesleywiser mentioned this pull request Sep 2, 2019

Fix const eval bug breaking run-pass tests in Miri #64100

Merged

eddyb reviewed Sep 12, 2019

View reviewed changes

Uh oh!

Move promoted MIR out of mir::Body #63580

Move promoted MIR out of mir::Body #63580

Uh oh!

Conversation

wesleywiser commented Aug 15, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

oli-obk commented Aug 17, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

oli-obk commented Aug 17, 2019

Uh oh!

wesleywiser commented Aug 17, 2019

Uh oh!

oli-obk commented Aug 17, 2019

Uh oh!

This comment has been minimized.

wesleywiser commented Aug 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

oli-obk commented Aug 17, 2019

Uh oh!

wesleywiser commented Aug 18, 2019

Uh oh!

Uh oh!

This comment has been minimized.

oli-obk commented Aug 26, 2019

Uh oh!

bors commented Aug 26, 2019

Uh oh!

bors commented Aug 26, 2019

Uh oh!

bors commented Aug 26, 2019

Uh oh!

rust-highfive commented Aug 26, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RalfJung commented Aug 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eddyb Sep 12, 2019

Choose a reason for hiding this comment

Uh oh!

eddyb Sep 12, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Move promoted MIR out of `mir::Body` #63580

Move promoted MIR out of `mir::Body` #63580

wesleywiser commented Aug 15, 2019 •

edited

Loading

wesleywiser commented Aug 17, 2019 •

edited

Loading

RalfJung commented Aug 27, 2019 •

edited

Loading