normalize signature before passing to check_sig_compat

David Renshaw · David Renshaw · commit 73ab5c77c23a · 2017-06-29T07:58:22.000-04:00
diff --git a/src/terminator/mod.rs b/src/terminator/mod.rs
@@ -76,6 +76,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
                                 let real_sig = instance_ty.fn_sig(self.tcx);
                                 let sig = self.erase_lifetimes(&sig);
                                 let real_sig = self.erase_lifetimes(&real_sig);
+                                let real_sig = self.tcx.normalize_associated_type(&real_sig);
                                 if !self.check_sig_compat(sig, real_sig)? {
                                     return Err(EvalError::FunctionPointerTyMismatch(real_sig, sig));
                                 }

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {`
`76`	`76`	`let real_sig = instance_ty.fn_sig(self.tcx);`
`77`	`77`	`let sig = self.erase_lifetimes(&sig);`
`78`	`78`	`let real_sig = self.erase_lifetimes(&real_sig);`
	`79`	`+ let real_sig = self.tcx.normalize_associated_type(&real_sig);`
`79`	`80`	`if !self.check_sig_compat(sig, real_sig)? {`
`80`	`81`	`return Err(EvalError::FunctionPointerTyMismatch(real_sig, sig));`
`81`	`82`	`}`