diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs
index 922b8a5824bec..1530ee8564752 100644
--- a/compiler/rustc_codegen_ssa/src/mir/block.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/block.rs
@@ -1197,7 +1197,6 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             (_, Some(llfn)) => llfn,
             _ => span_bug!(span, "no instance or llfn for call"),
         };
-        self.set_debug_loc(bx, mir::SourceInfo { span: fn_span, ..source_info });
         helper.do_call(
             self,
             bx,
diff --git a/tests/debuginfo/multiline-calls.rs b/tests/debuginfo/multiline-calls.rs
deleted file mode 100644
index 724ad29729fd2..0000000000000
--- a/tests/debuginfo/multiline-calls.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-//@ compile-flags:-g
-//@ min-gdb-version: 16.0
-
-// === GDB TESTS ===================================================================================
-
-// gdb-command: run
-// gdb-check:[...]#break[...]
-// gdb-command: up
-// gdb-check:[...]zzz[...]
-
-// === LLDB TESTS ==================================================================================
-
-// lldb-command:run
-// lldb-check:[...]#break[...]
-// lldb-command: up
-// lldb-check:[...]zzz[...]
-
-struct Foo;
-
-impl Foo {
-    fn bar(self) -> Foo {
-        println!("bar");
-        self
-    }
-    fn baz(self) -> Foo {
-        println!("baz"); // #break
-        self
-    }
-}
-
-fn main() {
-    let f = Foo;
-    f.bar()              // aaa
-        .baz();          // zzz
-}
diff --git a/tests/ui/panics/location-detail-unwrap-multiline.rs b/tests/ui/panics/location-detail-unwrap-multiline.rs
deleted file mode 100644
index 56e1760d851bb..0000000000000
--- a/tests/ui/panics/location-detail-unwrap-multiline.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//@ run-fail
-//@ compile-flags: -Cstrip=none -Cdebuginfo=line-tables-only -Copt-level=0
-//@ exec-env:RUST_BACKTRACE=1
-//@ regex-error-pattern: location-detail-unwrap-multiline\.rs:11(:10)?\n
-//@ needs-unwind
-//@ ignore-android FIXME #17520
-
-fn main() {
-    let opt: Option<u32> = None;
-    opt
-        .unwrap();
-}