squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

check that def_id is a local closure in InferCtxt::fn_sig

Browse source 
Before we were assuming that *every* `fn_sig` must pertain to a local
closure.
This commit is contained in:
Niko Matsakis 2017-11-21 04:45:47 -05:00
parent b9c766ccc0
commit 00732a31a0
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/librustc/infer/mod.rs
View file

@ -1481,20 +1481,29 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
/// work during the type-checking of the enclosing function and /// work during the type-checking of the enclosing function and
/// return the closure signature in its partially inferred state. /// return the closure signature in its partially inferred state.
pub fn fn_sig(&self, def_id: DefId) -> ty::PolyFnSig<'tcx> { pub fn fn_sig(&self, def_id: DefId) -> ty::PolyFnSig<'tcx> {
// Do we have an in-progress set of tables we are inferring?
if let Some(tables) = self.in_progress_tables { if let Some(tables) = self.in_progress_tables {
// Is this a local item?
if let Some(id) = self.tcx.hir.as_local_node_id(def_id) { if let Some(id) = self.tcx.hir.as_local_node_id(def_id) {
let hir_id = self.tcx.hir.node_to_hir_id(id); // Is it a local *closure*?
let closure_ty = tables.borrow().node_id_to_type(hir_id); if self.tcx.is_closure(def_id) {
let (closure_def_id, closure_substs) = match closure_ty.sty { let hir_id = self.tcx.hir.node_to_hir_id(id);
ty::TyClosure(closure_def_id, closure_substs) => // Is this local closure contained within the tables we are inferring?
(closure_def_id, closure_substs), if tables.borrow().local_id_root == Some(DefId::local(hir_id.owner)) {
_ => // if so, extract signature from there.
bug!("closure with non-closure type: {:?}", closure_ty), let closure_ty = tables.borrow().node_id_to_type(hir_id);
}; let (closure_def_id, closure_substs) = match closure_ty.sty {
assert_eq!(def_id, closure_def_id); ty::TyClosure(closure_def_id, closure_substs) =>
let closure_sig_ty = closure_substs.closure_sig_ty(def_id, self.tcx); (closure_def_id, closure_substs),
let closure_sig_ty = self.shallow_resolve(&closure_sig_ty); _ =>
return closure_sig_ty.fn_sig(self.tcx); bug!("closure with non-closure type: {:?}", closure_ty),
};
assert_eq!(def_id, closure_def_id);
let closure_sig_ty = closure_substs.closure_sig_ty(def_id, self.tcx);
let closure_sig_ty = self.shallow_resolve(&closure_sig_ty);
return closure_sig_ty.fn_sig(self.tcx);
}
}
} }
} }