Enable inline asm on macOS

[rust.git] / src / main_shim.rs

diff --git a/src/main_shim.rs b/src/main_shim.rs
index 9ce727279c27c876095a3e41f01698800ee57609..c67b6e98b32c7daeeca8558ed2882f082cd0b103 100644 (file)
--- a/src/main_shim.rs
+++ b/src/main_shim.rs
@@ -51,7 +51,10 @@ 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.normalize_erasing_regions(
+            ty::ParamEnv::reveal_all(),
+            main_ret_ty.no_bound_vars().unwrap(),
+        );
 
         let cmain_sig = Signature {
             params: vec![
@@ -106,7 +109,8 @@ fn create_entry_fn(
                     tcx.mk_substs([GenericArg::from(main_ret_ty)].iter()),
                 )
                 .unwrap()
-                .unwrap();
+                .unwrap()
+                .polymorphize(tcx);
 
                 let report_name = tcx.symbol_name(report).name;
                 let report_sig = get_function_sig(tcx, m.isa().triple(), report);