Auto merge of #74784 - anp:track-vtables, r=eddyb

Fix #[track_caller] shims for trait objects.

We were missing an Instance::resolve_for_fn_ptr in resolve_for_vtable.

Closes #74764.

diff --git a/src/librustc_middle/ty/instance.rs b/src/librustc_middle/ty/instance.rs
index cdb883da32bb0314eb85fc314e47e3dbb2d24399..289a9db7327e0d1e344996de1fd5af74b4d79dad 100644 (file)
--- a/src/librustc_middle/ty/instance.rs
+++ b/src/librustc_middle/ty/instance.rs
@@ -389,7 +389,7 @@ pub fn resolve_for_vtable(
             debug!(" => associated item with unsizeable self: Self");
             Some(Instance { def: InstanceDef::VtableShim(def_id), substs })
         } else {
-            Instance::resolve(tcx, param_env, def_id, substs).ok().flatten()
+            Instance::resolve_for_fn_ptr(tcx, param_env, def_id, substs)
         }
     }
 

diff --git a/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs b/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs
new file mode 100644 (file)
index 0000000..3b2a223
--- /dev/null
+++ b/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs
@@ -0,0 +1,23 @@
+// run-pass
+
+trait Tracked {
+    #[track_caller]
+    fn handle(&self) {
+        let location = std::panic::Location::caller();
+        assert_eq!(location.file(), file!());
+        // we only call this via trait object, so the def site should *always* be returned
+        assert_eq!(location.line(), line!() - 4);
+        assert_eq!(location.column(), 5);
+    }
+}
+
+impl Tracked for () {}
+impl Tracked for u8 {}
+
+fn main() {
+    let tracked: &dyn Tracked = &5u8;
+    tracked.handle();
+
+    const TRACKED: &dyn Tracked = &();
+    TRACKED.handle();
+}