Merge commit '9809f5d21990d9e24b3e9876ea7da756fd4e9def' into libgccjit-codegen

[rust.git] / compiler / rustc_codegen_gcc / src / mono_item.rs

diff --git a/compiler/rustc_codegen_gcc/src/mono_item.rs b/compiler/rustc_codegen_gcc/src/mono_item.rs
index cedeb54f60bf2e0ffa307676cc29ab4799d21fbd..e21d40b6c37e37f67bf4644b78aefcd7c13fe2cd 100644 (file)
--- a/compiler/rustc_codegen_gcc/src/mono_item.rs
+++ b/compiler/rustc_codegen_gcc/src/mono_item.rs
@@ -2,9 +2,8 @@
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::mir::mono::{Linkage, Visibility};
 use rustc_middle::ty::{self, Instance, TypeFoldable};
-use rustc_middle::ty::layout::{FnAbiExt, LayoutOf};
+use rustc_middle::ty::layout::{FnAbiOf, LayoutOf};
 use rustc_span::def_id::DefId;
-use rustc_target::abi::call::FnAbi;
 
 use crate::base;
 use crate::context::CodegenCx;
@@ -18,12 +17,7 @@ fn predefine_static(&self, def_id: DefId, _linkage: Linkage, _visibility: Visibi
         let gcc_type = self.layout_of(ty).gcc_type(self, true);
 
         let is_tls = attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL);
-        let global = self.define_global(symbol_name, gcc_type, is_tls, attrs.link_section).unwrap_or_else(|| {
-            self.sess().span_fatal(
-                self.tcx.def_span(def_id),
-                &format!("symbol `{}` is already defined", symbol_name),
-            )
-        });
+        let global = self.define_global(symbol_name, gcc_type, is_tls, attrs.link_section);
 
         // TODO(antoyo): set linkage and visibility.
         self.instances.borrow_mut().insert(instance, global);
@@ -32,7 +26,7 @@ fn predefine_static(&self, def_id: DefId, _linkage: Linkage, _visibility: Visibi
     fn predefine_fn(&self, instance: Instance<'tcx>, linkage: Linkage, _visibility: Visibility, symbol_name: &str) {
         assert!(!instance.substs.needs_infer());
 
-        let fn_abi = FnAbi::of_instance(self, instance, &[]);
+        let fn_abi = self.fn_abi_of_instance(instance, ty::List::empty());
         self.linkage.set(base::linkage_to_gcc(linkage));
         let _decl = self.declare_fn(symbol_name, &fn_abi);
         //let attrs = self.tcx.codegen_fn_attrs(instance.def_id());