nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-10 14:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly subst the fn_sig so that we get the correct types

Browse Source 
Otherwise we get random TySelfs there, which means operations on
RETURN_PLACE end up breaking down badly.
This commit is contained in:
Manish Goregaokar 2018-01-30 14:47:25 +05:30
parent ef4f4864f1
commit f97629160f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustc_mir/shim.rs
View File

@ -294,7 +294,7 @@ fn build_clone_shim<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
{ {
debug!("build_clone_shim(def_id={:?})", def_id); debug!("build_clone_shim(def_id={:?})", def_id);
let mut builder = CloneShimBuilder::new(tcx, def_id); let mut builder = CloneShimBuilder::new(tcx, def_id, self_ty);
let is_copy = !self_ty.moves_by_default(tcx, tcx.param_env(def_id), builder.span); let is_copy = !self_ty.moves_by_default(tcx, tcx.param_env(def_id), builder.span);
match self_ty.sty { match self_ty.sty {
@ -327,8 +327,14 @@ struct CloneShimBuilder<'a, 'tcx: 'a> {
} }
impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> { impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> {
fn new(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> Self { fn new(tcx: TyCtxt<'a, 'tcx, 'tcx>,
let sig = tcx.fn_sig(def_id); def_id: DefId,
self_ty: Ty<'tcx>) -> Self {
// we must subst the self_ty because it's
// otherwise going to be TySelf and we can't index
// or access fields of a Place of type TySelf.
let substs = tcx.mk_substs_trait(self_ty, &[]);
let sig = tcx.fn_sig(def_id).subst(tcx, substs);
let sig = tcx.erase_late_bound_regions(&sig); let sig = tcx.erase_late_bound_regions(&sig);
let span = tcx.def_span(def_id); let span = tcx.def_span(def_id);