Rollup merge of #81618 - bjorn3:sync_cg_clif-2021-02-01, r=bjorn3

[rust.git] / src / main_shim.rs

diff --git a/src/main_shim.rs b/src/main_shim.rs
index 5af5012279f6a8c7cdc0ff6458ae84feffcc136a..b193cea877dad493996c9bbee8cf1a1011345bc3 100644 (file)
--- a/src/main_shim.rs
+++ b/src/main_shim.rs
@@ -1,17 +1,19 @@
+use rustc_hir::LangItem;
+use rustc_session::config::EntryFnType;
+
 use crate::prelude::*;
 
 /// Create the `main` function which will initialize the rust runtime and call
 /// users main function.
-pub fn maybe_create_entry_wrapper(
+pub(crate) fn maybe_create_entry_wrapper(
     tcx: TyCtxt<'_>,
-    module: &mut Module<impl Backend + 'static>,
+    module: &mut impl Module,
+    unwind_context: &mut UnwindContext<'_>,
+    use_jit: bool,
 ) {
-    use rustc::middle::lang_items::StartFnLangItem;
-    use rustc::session::config::EntryFnType;
-
     let (main_def_id, use_start_lang_item) = match tcx.entry_fn(LOCAL_CRATE) {
         Some((def_id, entry_ty)) => (
-            def_id,
+            def_id.to_def_id(),
             match entry_ty {
                 EntryFnType::Main => true,
                 EntryFnType::Start => false,
@@ -20,13 +22,27 @@ pub fn maybe_create_entry_wrapper(
         None => return,
     };
 
-    create_entry_fn(tcx, module, main_def_id, use_start_lang_item);
+    let instance = Instance::mono(tcx, main_def_id).polymorphize(tcx);
+    if module.get_name(&*tcx.symbol_name(instance).name).is_none() {
+        return;
+    }
+
+    create_entry_fn(
+        tcx,
+        module,
+        unwind_context,
+        main_def_id,
+        use_start_lang_item,
+        use_jit,
+    );
 
     fn create_entry_fn(
         tcx: TyCtxt<'_>,
-        m: &mut Module<impl Backend + 'static>,
+        m: &mut impl Module,
+        unwind_context: &mut UnwindContext<'_>,
         rust_main_def_id: DefId,
         use_start_lang_item: bool,
+        use_jit: bool,
     ) {
         let main_ret_ty = tcx.fn_sig(rust_main_def_id).output();
         // Given that `main()` has no arguments,
@@ -34,7 +50,7 @@ fn create_entry_fn(
         // late-bound regions, since late-bound
         // regions must appear in the argument
         // listing.
-        let main_ret_ty = tcx.erase_regions(&main_ret_ty.no_bound_vars().unwrap());
+        let main_ret_ty = tcx.erase_regions(main_ret_ty.no_bound_vars().unwrap());
 
         let cmain_sig = Signature {
             params: vec![
@@ -44,42 +60,47 @@ fn create_entry_fn(
             returns: vec![AbiParam::new(
                 m.target_config().pointer_type(), /*isize*/
             )],
-            call_conv: CallConv::SystemV,
+            call_conv: CallConv::triple_default(m.isa().triple()),
         };
 
         let cmain_func_id = m
             .declare_function("main", Linkage::Export, &cmain_sig)
             .unwrap();
 
-        let instance = Instance::mono(tcx, rust_main_def_id);
+        let instance = Instance::mono(tcx, rust_main_def_id).polymorphize(tcx);
 
-        let (main_name, main_sig) = get_function_name_and_sig(tcx, instance, false);
+        let main_name = tcx.symbol_name(instance).name.to_string();
+        let main_sig = get_function_sig(tcx, m.isa().triple(), instance);
         let main_func_id = m
             .declare_function(&main_name, Linkage::Import, &main_sig)
             .unwrap();
 
         let mut ctx = Context::new();
-        ctx.func = Function::with_name_signature(ExternalName::user(0, 0), cmain_sig.clone());
+        ctx.func = Function::with_name_signature(ExternalName::user(0, 0), cmain_sig);
         {
             let mut func_ctx = FunctionBuilderContext::new();
-            let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
+            let mut bcx = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
+
+            let block = bcx.create_block();
+            bcx.switch_to_block(block);
+            let arg_argc = bcx.append_block_param(block, m.target_config().pointer_type());
+            let arg_argv = bcx.append_block_param(block, m.target_config().pointer_type());
 
-            let ebb = bcx.create_ebb();
-            bcx.switch_to_block(ebb);
-            let arg_argc = bcx.append_ebb_param(ebb, m.target_config().pointer_type());
-            let arg_argv = bcx.append_ebb_param(ebb, m.target_config().pointer_type());
+            crate::atomic_shim::init_global_lock(m, &mut bcx, use_jit);
 
             let main_func_ref = m.declare_func_in_func(main_func_id, &mut bcx.func);
 
             let call_inst = if use_start_lang_item {
-                let start_def_id = tcx.require_lang_item(StartFnLangItem, None);
+                let start_def_id = tcx.require_lang_item(LangItem::Start, None);
                 let start_instance = Instance::resolve(
                     tcx,
                     ParamEnv::reveal_all(),
                     start_def_id,
                     tcx.intern_substs(&[main_ret_ty.into()]),
                 )
-                .unwrap();
+                .unwrap()
+                .unwrap()
+                .polymorphize(tcx);
                 let start_func_id = import_function(tcx, m, start_instance);
 
                 let main_val = bcx
@@ -98,6 +119,12 @@ fn create_entry_fn(
             bcx.seal_all_blocks();
             bcx.finalize();
         }
-        m.define_function(cmain_func_id, &mut ctx).unwrap();
+        m.define_function(
+            cmain_func_id,
+            &mut ctx,
+            &mut cranelift_codegen::binemit::NullTrapSink {},
+        )
+        .unwrap();
+        unwind_context.add_function(cmain_func_id, &ctx, m.isa());
     }
 }