]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #45723 - sinkuu:ice_45493, r=arielb1
authorbors <bors@rust-lang.org>
Sun, 5 Nov 2017 19:19:59 +0000 (19:19 +0000)
committerbors <bors@rust-lang.org>
Sun, 5 Nov 2017 19:19:59 +0000 (19:19 +0000)
Fix MIR inlining panic in generic function

MIR inlining calls `Instance::resolve` with a substs containing param, and `trans_apply_param_substs` panics. ~~This PR fixes it by making `Instance::resolve` return `None` if `substs.has_param_types()`, though I'm not sure if this is a right fix.~~

Fixes #45493.


Trivial merge