diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-08-12 16:33:08 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-08-19 18:57:08 +0300 |
| commit | 0919f7c3a3690f7a0528e8447f8a9741eee45674 (patch) | |
| tree | 9a9df43dba4e40bbd2675c566b2fee665262d914 /src | |
| parent | ada6f1cd3db78f2972275c24f50721467aea4c70 (diff) | |
| download | rust-0919f7c3a3690f7a0528e8447f8a9741eee45674.tar.gz rust-0919f7c3a3690f7a0528e8447f8a9741eee45674.zip | |
rustc_mir: use self.resolve instead of Instance::resolve where possible.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/interpret/cast.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/librustc_mir/interpret/cast.rs b/src/librustc_mir/interpret/cast.rs index a3a237a1d3c..4fcf8d38da4 100644 --- a/src/librustc_mir/interpret/cast.rs +++ b/src/librustc_mir/interpret/cast.rs @@ -39,12 +39,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { if self.tcx.has_attr(def_id, sym::rustc_args_required_const) { bug!("reifying a fn ptr that requires const arguments"); } - let instance = ty::Instance::resolve( - *self.tcx, - self.param_env, - def_id, - substs, - ).ok_or_else(|| err_inval!(TooGeneric))?; + let instance = self.resolve(def_id, substs)?; let fn_ptr = self.memory.create_fn_alloc(FnVal::Instance(instance)); self.write_scalar(Scalar::Ptr(fn_ptr.into()), dest)?; } |
