diff options
| author | Oliver Schneider <oli-obk@users.noreply.github.com> | 2017-09-15 09:22:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 09:22:18 +0200 |
| commit | e8ea7da20111ce4e57031dc959678ec5429ee9b9 (patch) | |
| tree | 307b278983d06f5174bd371466dd39c3b01148a2 /src | |
| parent | 02e09dc187a8fa972768126ead54f89c0206db7a (diff) | |
| parent | 9db9308a79c0b66d71e4926381aa51553c4ff042 (diff) | |
| download | rust-e8ea7da20111ce4e57031dc959678ec5429ee9b9.tar.gz rust-e8ea7da20111ce4e57031dc959678ec5429ee9b9.zip | |
Merge pull request #339 from RalfJung/rustup
Storage{Live,Dead} in generators got fixedDiffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/interpret/eval_context.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs index 190e3018c7f..780155214a0 100644 --- a/src/librustc_mir/interpret/eval_context.rs +++ b/src/librustc_mir/interpret/eval_context.rs @@ -488,10 +488,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { // `Value` for that. let num_locals = mir.local_decls.len() - 1; - // FIXME: generators produce broken storage annotations (https://github.com/rust-lang/rust/issues/44179) - let locals = if mir.generator_layout.is_some() { - vec![Some(Value::ByVal(PrimVal::Undef)); num_locals] - } else { + let locals = { let annotated_locals = collect_storage_annotations(mir); let mut locals = vec![None; num_locals]; for i in 0..num_locals { |