From 407d1d5fd4a81b2bc717fc86475209eb59d50fb8 Mon Sep 17 00:00:00 2001
From: Adam Perry <adam.n.perry@gmail.com>
Date: Thu, 10 Oct 2019 07:31:22 -0700
Subject: [PATCH] Instance::resolve_for_fn_ptr unconditionally resolves first.

Per review feedback.
---
 src/librustc/ty/instance.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/librustc/ty/instance.rs b/src/librustc/ty/instance.rs
index b35b577ddf7..0a86b0b4148 100644
--- a/src/librustc/ty/instance.rs
+++ b/src/librustc/ty/instance.rs
@@ -310,15 +310,19 @@ impl<'tcx> Instance<'tcx> {
         substs: SubstsRef<'tcx>,
     ) -> Option<Instance<'tcx>> {
         debug!("resolve(def_id={:?}, substs={:?})", def_id, substs);
-        if tcx.codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::TRACK_CALLER) {
-            debug!(" => fn pointer created for function with #[track_caller]");
-            Some(Instance {
-                def: InstanceDef::ReifyShim(def_id),
-                substs,
-            })
-        } else {
-            Instance::resolve(tcx, param_env, def_id, substs)
-        }
+        Instance::resolve(tcx, param_env, def_id, substs).map(|resolved| {
+            let resolved_def = resolved.def_id();
+            let codegen_attrs = tcx.codegen_fn_attrs(resolved_def);
+            if codegen_attrs.flags.contains(CodegenFnAttrFlags::TRACK_CALLER) {
+                debug!(" => fn pointer created for function with #[track_caller]");
+                Instance {
+                    def: InstanceDef::ReifyShim(resolved_def),
+                    substs,
+                }
+            } else {
+                resolved
+            }
+        })
     }
 
     pub fn resolve_for_vtable(