From e9b68304efc447a7bcd35b06511f6dfdfe9da16d Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Thu, 2 Sep 2021 00:09:34 +0300
Subject: ty::layout: replicate `layout_of` setup for
 `fn_abi_of_{fn_ptr,instance}`.

---
 compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'compiler/rustc_codegen_llvm/src/debuginfo')

diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs b/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs
index c2725b83f50..e5fd5bae01b 100644
--- a/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs
@@ -3,12 +3,11 @@ use super::utils::DIB;
 use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext};
 use rustc_codegen_ssa::traits::*;
 
-use crate::abi::FnAbi;
 use crate::common::CodegenCx;
 use crate::llvm;
 use crate::llvm::debuginfo::{DILocation, DIScope};
 use rustc_middle::mir::{Body, SourceScope};
-use rustc_middle::ty::layout::FnAbiExt;
+use rustc_middle::ty::layout::FnAbiOf;
 use rustc_middle::ty::{self, Instance};
 use rustc_session::config::DebugInfo;
 
@@ -94,7 +93,7 @@ fn make_mir_scope(
                 ty::ParamEnv::reveal_all(),
                 callee,
             );
-            let callee_fn_abi = FnAbi::of_instance(cx, callee, &[]);
+            let callee_fn_abi = cx.fn_abi_of_instance(callee, &[]);
             cx.dbg_scope_fn(callee, &callee_fn_abi, None)
         }
         None => unsafe {
-- 
cgit 1.4.1-3-g733a5