Hold the state #18

oli-obk · 2016-06-01T16:57:16Z

precursor to #14

ok... iterator style was much easier than anticipated... The current design would require streaming iterators though...

Basically it returns the statement or the terminator that is going to be interpreted next. Then it actually interprets that at the next step call and returns the statement after that.

…unctions

solson · 2016-06-01T16:58:55Z

src/interpreter/iterator.rs

+            process: Self::dummy,
+        }
+    }
+    fn dummy(&mut self) -> EvalResult<()> { Ok(()) }


Style nit: blank lines between functions

solson · 2016-06-01T17:05:15Z

Do you think it's problematic that the recursive parts (where call_nested was called before) aren't part of the iterator, but have their own iterators?

I suppose like @eddyb said we could pre-compute statics/constants/promoted-rvalues.

Or on the other hand, in the current design once their resulting allocations are properly cached (and marked immutable in Memory somehow) they will effectively be lazily computed, which isn't semantically much different from pre-computing. So I guess it makes sense that they aren't part of the "same execution" (same Stepper).

solson · 2016-06-01T17:07:52Z

src/interpreter/mod.rs

@@ -996,13 +982,13 @@ impl<'a, 'b, 'mir, 'tcx> FnEvalContext<'a, 'b, 'mir, 'tcx> {
                use rustc::mir::repr::Literal::*;
                match *literal {
                    Value { ref value } => Ok(self.const_to_ptr(value)?),
-                    Item { .. } => unimplemented!(),
+                    Item { .. } => Err(EvalError::Unimplemented(format!("function pointers are unimplemented"))),


I believe Literal::Item can be more than just function pointers, but I'm not sure. @eddyb?

yea it can be more than that... but most of it is tagged with FIXMEs

I'd be happy with "literal items (e.g. mentions of function items) are unimplemented" just to avoid the possibility of future confusion.

EDIT: wording

oli-obk · 2016-06-01T17:11:30Z

We can always add that later. Whenever we enter a function, we could add its promoted values to a Vector which we first process in the step function. That messes up the order somewhat, but I think it can be expected that constants are computed before everything else.

For global constants/statics we'd need something else, because that would have to happen during the creation of the global context and before the first function call... Maybe some kind of builder?

and marked immutable in Memory somehow

not all statics should be immutable.

solson · 2016-06-01T17:13:03Z

not all statics should be immutable.

@oli-obk In the constant evaluator, according to @eddyb's model, they should be. I believe even static mut mutation was to be banned at compile-time.

solson · 2016-06-01T17:15:28Z

src/interpreter/mod.rs

@@ -20,6 +20,8 @@ use error::{EvalError, EvalResult};
 use memory::{Memory, Pointer};
 use primval::{self, PrimVal};

+mod iterator;


This module name/filename is confusing given that it has no Iterator impl. mod stepper perhaps?

solson · 2016-06-01T17:38:36Z

tests/compile-fail/unimplemented.rs

+#[miri_run]
+fn static_mut() {
+    unsafe {
+        X = 6;


So yeah, this might fail for a different reason in the future (mutation of a static), but I'm fine with having it here so we notice when that happens.

Although it would be allowed in versions of Miri not intended for rustc const eval.

eddyb · 2016-06-01T22:52:54Z

LGTM, modulo the lack of constant pre-computation. Do note that when part of this gets merged into rustc, some of the constants will already have been computed by rustc itself and may have caused compiler errors, possibly before miri can really take over.

oli-obk · 2016-06-02T08:06:59Z

some of the constants will already have been computed by rustc itself

Why only some?

may have caused compiler errors, possibly before miri can really take over.

Interpreting code with compiler errors is probably not useful anyway. Miri already aborts if there were compiler errors.

the lack of constant pre-computation

It's easy to implement for promoted constants. But there's no list of global constants/statics...

Also evaluating a constant might require evaluating another constant. So even if we cache constants, we'd need to evaluate them in an order that makes sure that all required constants are computed before the requiring constant.

I'm not sure how to proceed...

eddyb · 2016-06-02T08:12:58Z

Why only some?

Because you may not be able to evaluate, e.g. an associated constant used from a function which is also generic - only trans-time monomorphization (or miri, in this case) will trigger its evaluation.

It's easy to implement for promoted constants. But there's no list of global constants/statics...

Not really, what I meant is collecting all uses of constants in a function, and having that as a different set of states, before any statement/terminator.
When finishing evaluation of a constant, you pop a "stack frame" and go to the next pending constant in the "caller", and if there aren't any left, you go to (START_BLOCK, 0).

oli-obk · 2016-06-02T15:40:39Z

I refactored the code to cache statics globally and cache promoteds just for the current stackframe. This has the ~~unfortunate~~ side-effect, that statics can now be written to. When miri is integrated into rustc, modifications of statics should probably be caught by an analysis pass, and not miri.

I also removed the current recursion that happens when evaluating a static/constant, and now the stepper simply pushes another stack frame for constants/statics

oli-obk · 2016-06-02T15:41:30Z

The way it's written now, we technically don't need to do the pre-evaluation of promoteds and constants... we could just do it on-demand. That would probably simplify the code. Should I do that?

eddyb · 2016-06-02T15:58:32Z

@oli-obk How can you easily do it on-demand? You can have arbitrarily many constant operands in one statement/terminator, even the simplest ones.
This is in part because of the indexing on lvalue, i.e. var0[A][B][C][D] is a valid Lvalue.

eddyb · 2016-06-02T15:58:56Z

@oli-obk Unless you mean just before the statement/terminator, which I guess is a fine approach.

oli-obk · 2016-06-02T16:01:30Z

This is in part because of the indexing on lvalue, i.e. var0[A][B][C][D] is a valid Lvalue.

oh right, so we wouldn't save the allocation of the vector... let's leave it as is.

oli-obk · 2016-06-02T16:02:49Z

some benchmarks, not much of a change compared with the last ones

test fib           ... bench:         111 ns/iter (+/- 3)
test fib_iter      ... bench:           1 ns/iter (+/- 0)
test fib_iter_miri ... bench:   8,813,523 ns/iter (+/- 296,007)
test fib_miri      ... bench:   5,816,824 ns/iter (+/- 259,427)

oli-obk · 2016-06-03T14:12:54Z

this PR ended up being able to evaluate fewer functions than before, because there might be statics/promoteds that aren't needed in the interpretation and thus weren't interpreted before. If those statics/constants contained code that miri can't interpret (yet), the entire function evaluation failed. I added a refactoring of the call stack and moved to interpret constants only just before the statement/terminator that needs them.

oli-obk · 2016-06-08T10:36:26Z

I addressed all the comments. I modified the commits in place, because some refactorings were easier done by simply removing commits (e.g. the function/frame split)

oli-obk · 2016-06-08T10:38:26Z

The major change is the way the stepper works. You pass a closure to the step function instead of processing the return value. This makes the code much more concise and prevents us from reloading the entire state at every call. I'm benchmarking currently to figure out if that undoes the performance regression from the constant-jit changes.

Results from benchmarking:

66a812f: before this PR

test fib ... bench: 117 ns/iter (+/- 3)
test fib_iter ... bench: 1 ns/iter (+/- 0)
test fib_iter_miri ... bench: 8,833,133 ns/iter (+/- 337,526)
test fib_miri ... bench: 5,795,607 ns/iter (+/- 267,028)

5a8b0ab: don't clone the MIR Rc in every iteration

test fib ... bench: 116 ns/iter (+/- 3)
test fib_iter ... bench: 1 ns/iter (+/- 0)
test fib_iter_miri ... bench: 8,907,749 ns/iter (+/- 367,226)
test fib_miri ... bench: 5,817,732 ns/iter (+/- 181,318)

2405c81: initial stepper impl

test fib ... bench: 116 ns/iter (+/- 3)
test fib_iter ... bench: 1 ns/iter (+/- 0)
test fib_iter_miri ... bench: 8,935,775 ns/iter (+/- 530,953)
test fib_miri ... bench: 5,968,109 ns/iter (+/- 248,810)

cc1ca73: constants-jit

test fib ... bench: 116 ns/iter (+/- 3)
test fib_iter ... bench: 1 ns/iter (+/- 0)
test fib_iter_miri ... bench: 9,418,480 ns/iter (+/- 546,537)
test fib_miri ... bench: 6,185,454 ns/iter (+/- 334,436)

4c833a5: cache constants

test fib ... bench: 110 ns/iter (+/- 2)
test fib_iter ... bench: 1 ns/iter (+/- 0)
test fib_iter_miri ... bench: 9,169,303 ns/iter (+/- 460,202)
test fib_miri ... bench: 6,022,409 ns/iter (+/- 352,178)

8b25bc8: directly push stackframes for constants when they are encountered

test fib ... bench: 117 ns/iter (+/- 3)
test fib_iter ... bench: 1 ns/iter (+/- 0)
test fib_iter_miri ... bench: 9,346,218 ns/iter (+/- 385,956)
test fib_miri ... bench: 6,133,005 ns/iter (+/- 411,449)

after this PR (passing closures):

test fib ... bench: 110 ns/iter (+/- 3)
test fib_iter ... bench: 1 ns/iter (+/- 0)
test fib_iter_miri ... bench: 9,013,827 ns/iter (+/- 210,114)
test fib_miri ... bench: 5,829,444 ns/iter (+/- 237,403)

oli-obk · 2016-06-08T10:42:04Z

how is travis passing if there's a failure? Can we force travis to work with a specific rustc version?

solson · 2016-06-09T03:50:08Z

~~Why do the Stepper functions take closures? I don't understand the overall goal with that.~~ (see below)

solson · 2016-06-09T04:07:51Z

My main concern now is the Mir cloning I mentioned in #18 (comment).

EDIT: Oops, missed your explanation of the Stepper closures above.

So, there's just one external call to step at https://github.com/solson/miri/pull/18/files#diff-b6ba58183c703f8ffcaa54879146b1c2R401. What if we inlined the trace! calls into Stepper and only had to worry about done? Could it get simplified down and not require the closures?

oli-obk · 2016-06-09T08:55:47Z

What if we inlined the trace! calls into Stepper and only had to worry about done? Could it get simplified down and not require the closures?

done.

My main concern now is the Mir cloning I mentioned in #18 (comment).

We can cache it to ensure that the cloning only ever happens once for every promoted.

solson · 2016-06-09T09:11:18Z

src/interpreter/stepper.rs

@@ -151,9 +151,10 @@ impl<'a, 'b, 'mir, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'mir, 'tcx>
            // already computed by rustc
            mir::Literal::Value { .. } => {}
            mir::Literal::Item { def_id, substs } => {
-                let item_ty = self.gecx.tcx.lookup_item_type(def_id).subst(self.gecx.tcx, substs);


I think this change also applies to https://github.com/solson/miri/pull/18/files#diff-b6ba58183c703f8ffcaa54879146b1c2R1192

it does, fixed

…f_id

…nctions

solson · 2016-06-10T01:23:39Z

I read through the changes one last time. I think I'm ready to merge.

@eddyb Did you have any outstanding comments?

@oli-obk Was there anything you didn't get around to yet that you wanted to?

solson · 2016-06-10T03:13:16Z

I heard from eddyb on IRC, so I'll just merge now.

Implement .values() and .values_mut()

Change prefetch to avoid deadlock Was abled to reproduce the deadlock in #118205 and created a coredump when it happen. When looking at the backtraces I noticed that the prefetch of exported_symbols (Thread 17 frame 4) started after the "actual" exported_symbols (Thread 2 frame 18) but it also is working on some of the collect_crate_mono_items (Thread 17 frame12 ) that Thread 2 is blocked on resulting in a deadlock. This PR results in less parallell work that can be done at the same time but from what I can find we do not call the query exported_symbols from multiple places in the same join call any more. ``` Thread 17 (Thread 0x7f87b6299700 (LWP 11370)): #0 syscall () at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:38 #1 0x00007f87be5166a9 in <parking_lot::condvar::Condvar>::wait_until_internal () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #2 0x00007f87be12d854 in <rustc_query_system::query::job::QueryLatch>::wait_on () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #3 0x00007f87bd27d16f in rustc_query_system::query::plumbing::try_execute_query::<rustc_query_impl::DynamicConfig<rustc_query_system::query::caches::VecCache<rustc_span::def_id::CrateNum, rustc_middle::query::erase::Erased<[u8; 16]>>, false, false, false>, rustc_query_impl::plumbing::QueryCtxt, false> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #4 0x00007f87bd0b5b6a in rustc_query_impl::query_impl::exported_symbols::get_query_non_incr::__rust_end_short_backtrace () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #5 0x00007f87bdaebb0a in rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}::{closure#1} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #6 0x00007f87bdae1509 in rayon_core::join::join_context::call_b::<core::option::Option<rustc_data_structures::marker::FromDyn<&[(rustc_middle::middle::exported_symbols::ExportedSymbol, rustc_middle::middle::exported_symbols::SymbolExportInfo)]>>, rayon_core::join::join::call<core::option::Option<rustc_data_structures::marker::FromDyn<&[(rustc_middle::middle::exported_symbols::ExportedSymbol, rustc_middle::middle::exported_symbols::SymbolExportInfo)]>>, rustc_data_structures::sync::parallel::enabled::join<rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}::{closure#0}, rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}::{closure#1}, (), &[(rustc_middle::middle::exported_symbols::ExportedSymbol, rustc_middle::middle::exported_symbols::SymbolExportInfo)]>::{closure#0}::{closure#1}>::{closure#0}>::{closure#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #7 0x00007f87bdae32ff in <rayon_core::job::StackJob<rayon_core::latch::SpinLatch, rayon_core::join::join_context::call_b<core::option::Option<rustc_data_structures::marker::FromDyn<&[(rustc_middle::middle::exported_symbols::ExportedSymbol, rustc_middle::middle::exported_symbols::SymbolExportInfo)]>>, rayon_core::join::join::call<core::option::Option<rustc_data_structures::marker::FromDyn<&[(rustc_middle::middle::exported_symbols::ExportedSymbol, rustc_middle::middle::exported_symbols::SymbolExportInfo)]>>, rustc_data_structures::sync::parallel::enabled::join<rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}::{closure#0}, rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}::{closure#1}, (), &[(rustc_middle::middle::exported_symbols::ExportedSymbol, rustc_middle::middle::exported_symbols::SymbolExportInfo)]>::{closure#0}::{closure#1}>::{closure#0}>::{closure#0}, core::option::Option<rustc_data_structures::marker::FromDyn<&[(rustc_middle::middle::exported_symbols::ExportedSymbol, rustc_middle::middle::exported_symbols::SymbolExportInfo)]>>> as rayon_core::job::Job>::execute () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #8 0x00007f87b8338823 in <rayon_core::registry::WorkerThread>::wait_until_cold () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #9 0x00007f87bc2edbaf in rayon_core::join::join_context::<rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#0}, rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#1}, (), ()>::{closure#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #10 0x00007f87bc2ed313 in rayon_core::registry::in_worker::<rayon_core::join::join_context<rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#0}, rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#1}, (), ()>::{closure#0}, ((), ())> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #11 0x00007f87bc2db2a4 in rayon::iter::plumbing::bridge_producer_consumer::helper::<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #12 0x00007f87bc2eead2 in <rayon_core::job::StackJob<rayon_core::latch::SpinLatch, rayon_core::join::join_context::call_b<(), rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#1}>::{closure#0}, ()> as rayon_core::job::Job>::execute () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #13 0x00007f87b8338823 in <rayon_core::registry::WorkerThread>::wait_until_cold () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #14 0x00007f87be52d1f9 in <rayon_core::registry::ThreadBuilder>::run () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #15 0x00007f87b8461c57 in <scoped_tls::ScopedKey<rustc_span::SessionGlobals>>::set::<rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#0}::{closure#0}, ()> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #16 0x00007f87b846e465 in rustc_span::set_session_globals_then::<(), rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#0}::{closure#0}> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #17 0x00007f87b844f282 in <<crossbeam_utils::thread::ScopedThreadBuilder>::spawn<<rayon_core::ThreadPoolBuilder>::build_scoped<rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#0}, rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#1}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#0}::{closure#0}::{closure#0}, ()>::{closure#0} as core::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #18 0x00007f87b846af58 in <<std::thread::Builder>::spawn_unchecked_<alloc::boxed::Box<dyn core::ops::function::FnOnce<(), Output = ()> + core::marker::Send>, ()>::{closure#1} as core::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #19 0x00007f87b7898e85 in std::sys::unix::thread::Thread::new::thread_start () from /home/andjo403/.rustup/toolchains/stage1/lib/libstd-d570b0650d35d951.so #20 0x00007f87b7615609 in start_thread (arg=<optimized out>) at pthread_create.c:477 #21 0x00007f87b7755133 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Thread 2 (Thread 0x7f87b729b700 (LWP 11368)): #0 syscall () at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:38 #1 0x00007f87b7887b51 in std::sys::unix::locks::futex_condvar::Condvar::wait () from /home/andjo403/.rustup/toolchains/stage1/lib/libstd-d570b0650d35d951.so #2 0x00007f87b8339478 in <rayon_core::sleep::Sleep>::sleep () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #3 0x00007f87b83387c3 in <rayon_core::registry::WorkerThread>::wait_until_cold () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #4 0x00007f87bc2edbaf in rayon_core::join::join_context::<rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#0}, rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#1}, (), ()>::{closure#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #5 0x00007f87bc2ed313 in rayon_core::registry::in_worker::<rayon_core::join::join_context<rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#0}, rayon::iter::plumbing::bridge_producer_consumer::helper<rayon::vec::DrainProducer<rustc_middle::mir::mono::MonoItem>, rayon::iter::for_each::ForEachConsumer<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}>>::{closure#1}, (), ()>::{closure#0}, ((), ())> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #6 0x00007f87bc2db50c in <rayon::vec::IntoIter<rustc_middle::mir::mono::MonoItem> as rayon::iter::ParallelIterator>::for_each::<rustc_data_structures::sync::parallel::enabled::par_for_each_in<rustc_middle::mir::mono::MonoItem, alloc::vec::Vec<rustc_middle::mir::mono::MonoItem>, rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}::{closure#0}>::{closure#0}::{closure#0}> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #7 0x00007f87bc2e8cd7 in <rustc_session::session::Session>::time::<(), rustc_monomorphize::collector::collect_crate_mono_items::{closure#1}> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #8 0x00007f87bc2b8f2c in rustc_monomorphize::collector::collect_crate_mono_items () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #9 0x00007f87bc2c30d9 in rustc_monomorphize::partitioning::collect_and_partition_mono_items () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #10 0x00007f87bcf2cde6 in rustc_query_impl::plumbing::__rust_begin_short_backtrace::<rustc_query_impl::query_impl::collect_and_partition_mono_items::dynamic_query::{closure#2}::{closure#0}, rustc_middle::query::erase::Erased<[u8; 24]>> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #11 0x00007f87bd156a3c in <rustc_query_impl::query_impl::collect_and_partition_mono_items::dynamic_query::{closure#2} as core::ops::function::FnOnce<(rustc_middle::ty::context::TyCtxt, ())>>::call_once () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #12 0x00007f87bd1c6a7d in rustc_query_system::query::plumbing::try_execute_query::<rustc_query_impl::DynamicConfig<rustc_query_system::query::caches::SingleCache<rustc_middle::query::erase::Erased<[u8; 24]>>, false, false, false>, rustc_query_impl::plumbing::QueryCtxt, false> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #13 0x00007f87bd15df40 in rustc_query_impl::query_impl::collect_and_partition_mono_items::get_query_non_incr::__rust_end_short_backtrace () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #14 0x00007f87bd7a0ad9 in rustc_codegen_ssa::back::symbol_export::exported_symbols_provider_local () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #15 0x00007f87bcf29acb in rustc_query_impl::plumbing::__rust_begin_short_backtrace::<rustc_query_impl::query_impl::exported_symbols::dynamic_query::{closure#2}::{closure#0}, rustc_middle::query::erase::Erased<[u8; 16]>> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #16 0x00007f87bcfdb350 in <rustc_query_impl::query_impl::exported_symbols::dynamic_query::{closure#2} as core::ops::function::FnOnce<(rustc_middle::ty::context::TyCtxt, rustc_span::def_id::CrateNum)>>::call_once () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #17 0x00007f87bd27d64f in rustc_query_system::query::plumbing::try_execute_query::<rustc_query_impl::DynamicConfig<rustc_query_system::query::caches::VecCache<rustc_span::def_id::CrateNum, rustc_middle::query::erase::Erased<[u8; 16]>>, false, false, false>, rustc_query_impl::plumbing::QueryCtxt, false> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #18 0x00007f87bd0b5b6a in rustc_query_impl::query_impl::exported_symbols::get_query_non_incr::__rust_end_short_backtrace () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #19 0x00007f87bda927ce in rustc_middle::query::plumbing::query_get_at::<rustc_query_system::query::caches::VecCache<rustc_span::def_id::CrateNum, rustc_middle::query::erase::Erased<[u8; 16]>>> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #20 0x00007f87bda9c93f in <rustc_metadata::rmeta::encoder::EncodeContext>::encode_crate_root () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #21 0x00007f87bdaa6ef7 in rustc_metadata::rmeta::encoder::encode_metadata_impl () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #22 0x00007f87bdae0b77 in rayon_core::join::join_context::<rayon_core::join::join::call<core::option::Option<rustc_data_structures::marker::FromDyn<()>>, rustc_data_structures::sync::parallel::enabled::join<rustc_metadata::rmeta::encoder::encode_metadata::{closure#0}, rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}, (), ()>::{closure#0}::{closure#0}>::{closure#0}, rayon_core::join::join::call<core::option::Option<rustc_data_structures::marker::FromDyn<()>>, rustc_data_structures::sync::parallel::enabled::join<rustc_metadata::rmeta::encoder::encode_metadata::{closure#0}, rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}, (), ()>::{closure#0}::{closure#1}>::{closure#0}, core::option::Option<rustc_data_structures::marker::FromDyn<()>>, core::option::Option<rustc_data_structures::marker::FromDyn<()>>>::{closure#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #23 0x00007f87bdaded2f in rayon_core::registry::in_worker::<rayon_core::join::join_context<rayon_core::join::join::call<core::option::Option<rustc_data_structures::marker::FromDyn<()>>, rustc_data_structures::sync::parallel::enabled::join<rustc_metadata::rmeta::encoder::encode_metadata::{closure#0}, rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}, (), ()>::{closure#0}::{closure#0}>::{closure#0}, rayon_core::join::join::call<core::option::Option<rustc_data_structures::marker::FromDyn<()>>, rustc_data_structures::sync::parallel::enabled::join<rustc_metadata::rmeta::encoder::encode_metadata::{closure#0}, rustc_metadata::rmeta::encoder::encode_metadata::{closure#1}, (), ()>::{closure#0}::{closure#1}>::{closure#0}, core::option::Option<rustc_data_structures::marker::FromDyn<()>>, core::option::Option<rustc_data_structures::marker::FromDyn<()>>>::{closure#0}, (core::option::Option<rustc_data_structures::marker::FromDyn<()>>, core::option::Option<rustc_data_structures::marker::FromDyn<()>>)> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #24 0x00007f87bdaa5a03 in rustc_metadata::rmeta::encoder::encode_metadata () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #25 0x00007f87bdaed628 in rustc_metadata::fs::encode_and_write_metadata () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #26 0x00007f87b86608be in rustc_interface::passes::start_codegen () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #27 0x00007f87b8664946 in <rustc_middle::ty::context::GlobalCtxt>::enter::<<rustc_interface::queries::Queries>::codegen_and_build_linker::{closure#0}, core::result::Result<rustc_interface::queries::Linker, rustc_span::ErrorGuaranteed>> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #28 0x00007f87b864db00 in <rustc_interface::queries::Queries>::codegen_and_build_linker () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #29 0x00007f87b849400f in <rustc_interface::interface::Compiler>::enter::<rustc_driver_impl::run_compiler::{closure#0}::{closure#0}, core::result::Result<core::option::Option<rustc_interface::queries::Linker>, rustc_span::ErrorGuaranteed>> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #30 0x00007f87b846e067 in rustc_span::set_source_map::<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}::{closure#0}> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #31 0x00007f87b844dc13 in <rayon_core::thread_pool::ThreadPool>::install::<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #32 0x00007f87b84509a1 in <rayon_core::job::StackJob<rayon_core::latch::LatchRef<rayon_core::latch::LockLatch>, <rayon_core::registry::Registry>::in_worker_cold<<rayon_core::thread_pool::ThreadPool>::install<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#0}::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>> as rayon_core::job::Job>::execute () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #33 0x00007f87b8338823 in <rayon_core::registry::WorkerThread>::wait_until_cold () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #34 0x00007f87be52d1f9 in <rayon_core::registry::ThreadBuilder>::run () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #35 0x00007f87b8461c57 in <scoped_tls::ScopedKey<rustc_span::SessionGlobals>>::set::<rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#0}::{closure#0}, ()> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #36 0x00007f87b846e465 in rustc_span::set_session_globals_then::<(), rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#0}::{closure#0}> () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #37 0x00007f87b844f282 in <<crossbeam_utils::thread::ScopedThreadBuilder>::spawn<<rayon_core::ThreadPoolBuilder>::build_scoped<rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#0}, rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<core::result::Result<(), rustc_span::ErrorGuaranteed>, rustc_driver_impl::run_compiler::{closure#0}>::{closure#0}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#3}::{closure#0}::{closure#1}, core::result::Result<(), rustc_span::ErrorGuaranteed>>::{closure#0}::{closure#0}::{closure#0}, ()>::{closure#0} as core::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #38 0x00007f87b846af58 in <<std::thread::Builder>::spawn_unchecked_<alloc::boxed::Box<dyn core::ops::function::FnOnce<(), Output = ()> + core::marker::Send>, ()>::{closure#1} as core::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} () from /home/andjo403/.rustup/toolchains/stage1/lib/librustc_driver-70ddb84e8f7ce707.so #39 0x00007f87b7898e85 in std::sys::unix::thread::Thread::new::thread_start () from /home/andjo403/.rustup/toolchains/stage1/lib/libstd-d570b0650d35d951.so #40 0x00007f87b7615609 in start_thread (arg=<optimized out>) at pthread_create.c:477 #41 0x00007f87b7755133 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 ``` fixes #118205 fixes #117759 from the latest logs it is the same query map as in #118205 fixes #118529 fixes #117784 cc #118206 r? `@SparrowLii`

oli-obk added 4 commits June 1, 2016 18:50

can't evaluate failed assertions yet

e73fa77

remove one layer of indirection when interpreting const/static/main f…

8398781

…unctions

don't clone the MIR Rc in every iteration

5a8b0ab

stepwise interpretation

2405c81

solson reviewed Jun 1, 2016
View reviewed changes

style: spaces between functions

77e1ec2

solson reviewed Jun 1, 2016
View reviewed changes

oli-obk added 2 commits June 1, 2016 19:17

rename iterator module to stepper

0c269a5

note that not all literal items are function pointers

5211178

solson reviewed Jun 1, 2016
View reviewed changes

oli-obk added 2 commits June 2, 2016 17:05

also step through promoteds, constants and statics

6ac64f1

add a const fn test

97bc1d4

oli-obk added 3 commits June 2, 2016 18:03

remove a debug message that snuck into the commit

38ae352

merge the three stacks in the interpreter

05f829c

jit interpretation of constants

cc1ca73

store the current block in the frame

f995db9

oli-obk added 10 commits June 8, 2016 09:38

move some methods from FnEvalContext to GlobalEvalContext

4d44a97

move load_mir to the global eval context

f42be6d

clippy nits

c881cf1

don't cache the MIR in the Stepper

1f27d3f

rebase leftovers

6b939bb

directly push stackframes for constants when they are encountered

8b25bc8

no more function pointers

3de30e3

put ConstantId's common fields into a struct

3868a62

improve fn argument naming

240f0c0

improve the docs of ConstantId

2178961

the statement/terminator has already been computed, don't do it again

cbbf58b

refactor away the closures and Event enum

59d858a

solson reviewed Jun 9, 2016
View reviewed changes

oli-obk added 3 commits June 9, 2016 11:16

we already have the constant's type, no need to recompute from the de…

225a6a2

…f_id

make sure globals that yield function pointers aren't treated like fu…

040a501

…nctions

rename static_item to global_item

05eaa52

solson merged commit 1186a7d into rust-lang:master Jun 10, 2016

oli-obk deleted the hold_the_state branch June 20, 2016 09:01

erickt pushed a commit to erickt/miri that referenced this pull request Feb 4, 2022

Merge pull request rust-lang#18 from bluss/values

63a4509

Implement .values() and .values_mut()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hold the state #18

Hold the state #18

oli-obk commented Jun 1, 2016

solson Jun 1, 2016

solson commented Jun 1, 2016

solson Jun 1, 2016

oli-obk Jun 1, 2016

solson Jun 1, 2016 •

edited

Loading

oli-obk Jun 1, 2016

oli-obk commented Jun 1, 2016

solson commented Jun 1, 2016

solson Jun 1, 2016

oli-obk Jun 1, 2016

solson Jun 1, 2016

eddyb commented Jun 1, 2016

oli-obk commented Jun 2, 2016

eddyb commented Jun 2, 2016

oli-obk commented Jun 2, 2016 •

edited

Loading

oli-obk commented Jun 2, 2016 •

edited

Loading

eddyb commented Jun 2, 2016

eddyb commented Jun 2, 2016

oli-obk commented Jun 2, 2016

oli-obk commented Jun 2, 2016

oli-obk commented Jun 3, 2016

oli-obk commented Jun 8, 2016

oli-obk commented Jun 8, 2016 •

edited

Loading

oli-obk commented Jun 8, 2016

solson commented Jun 9, 2016 •

edited

Loading

solson commented Jun 9, 2016 •

edited

Loading

oli-obk commented Jun 9, 2016

solson Jun 9, 2016

oli-obk Jun 9, 2016

solson commented Jun 10, 2016

solson commented Jun 10, 2016

Hold the state #18

Hold the state #18

Conversation

oli-obk commented Jun 1, 2016

Choose a reason for hiding this comment

solson commented Jun 1, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

solson Jun 1, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oli-obk commented Jun 1, 2016

solson commented Jun 1, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddyb commented Jun 1, 2016

oli-obk commented Jun 2, 2016

eddyb commented Jun 2, 2016

oli-obk commented Jun 2, 2016 • edited Loading

oli-obk commented Jun 2, 2016 • edited Loading

eddyb commented Jun 2, 2016

eddyb commented Jun 2, 2016

oli-obk commented Jun 2, 2016

oli-obk commented Jun 2, 2016

oli-obk commented Jun 3, 2016

oli-obk commented Jun 8, 2016

oli-obk commented Jun 8, 2016 • edited Loading

oli-obk commented Jun 8, 2016

solson commented Jun 9, 2016 • edited Loading

solson commented Jun 9, 2016 • edited Loading

oli-obk commented Jun 9, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

solson commented Jun 10, 2016

solson commented Jun 10, 2016

solson Jun 1, 2016 •

edited

Loading

oli-obk commented Jun 2, 2016 •

edited

Loading

oli-obk commented Jun 2, 2016 •

edited

Loading

oli-obk commented Jun 8, 2016 •

edited

Loading

solson commented Jun 9, 2016 •

edited

Loading

solson commented Jun 9, 2016 •

edited

Loading