bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix type_dependent_defs ICE on method calls

Browse source
This commit is contained in:
varkor 2018-03-21 18:01:51 +00:00
parent 75af15ee6c
commit 4b673249f8
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustc_passes/rvalue_promotion.rs
View file

@ -373,10 +373,14 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Expr, node
}
}
hir::ExprMethodCall(..) => {
let def_id = v.tables.type_dependent_defs()[e.hir_id].def_id();
match v.tcx.associated_item(def_id).container {
ty::ImplContainer(_) => v.handle_const_fn_call(def_id, node_ty),
ty::TraitContainer(_) => v.promotable = false
if let Some(def) = v.tables.type_dependent_defs().get(e.hir_id) {
let def_id = def.def_id();
match v.tcx.associated_item(def_id).container {
ty::ImplContainer(_) => v.handle_const_fn_call(def_id, node_ty),
ty::TraitContainer(_) => v.promotable = false
}
} else {
v.tcx.sess.delay_span_bug(e.span, "no type-dependent def for method call");
}
}
hir::ExprStruct(..) => {

15
src/test/compile-fail/type-dependent-def-issue-49241.rs Normal file
View file

@ -0,0 +1,15 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn main() {
let v = vec![0];
const l: usize = v.count(); //~ ERROR can't capture dynamic environment in a fn item
let s: [u32; l] = v.into_iter().collect(); //~ ERROR constant evaluation error
}