From 8efafa18e5ebc70d5219f8d9d016f2694dcb2196 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Thu, 20 Sep 2018 20:44:07 -0500 Subject: [PATCH] Extend MIR inlining to all operand variants --- src/librustc_mir/transform/inline.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 8689fde3ee64..04f61235ca19 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -94,8 +94,8 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> { // Only consider direct calls to functions let terminator = bb_data.terminator(); if let TerminatorKind::Call { - func: Operand::Constant(ref f), .. } = terminator.kind { - if let ty::FnDef(callee_def_id, substs) = f.ty.sty { + func: ref op, .. } = terminator.kind { + if let ty::FnDef(callee_def_id, substs) = op.ty(caller_mir, self.tcx).sty { if let Some(instance) = Instance::resolve(self.tcx, param_env, callee_def_id,