Don't use process::exit as it is an unreachable on wasm32

rust-lang · Dec 26, 2017 · 5a4298b · 5a4298b
1 parent 2cdd1c4
commit 5a4298b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
@@ -552,10 +552,7 @@ fn maybe_create_entry_wrapper(ccx: &CrateContext) {
                        rust_main: ValueRef,
                        rust_main_def_id: DefId,
                        use_start_lang_item: bool) {
-        // The libstd lang_start function does not return anything, while user defined lang start
-        // returns a isize
-        let start_output_ty = if use_start_lang_item { Type::void(ccx) } else { Type::c_int(ccx) };
-        let llfty = Type::func(&[Type::c_int(ccx), Type::i8p(ccx).ptr_to()], &start_output_ty);
+        let llfty = Type::func(&[Type::c_int(ccx), Type::i8p(ccx).ptr_to()], &Type::c_int(ccx));
 
         let main_ret_ty = ccx.tcx().fn_sig(rust_main_def_id).output();
         // Given that `main()` has no arguments,
@@ -600,12 +597,7 @@ fn maybe_create_entry_wrapper(ccx: &CrateContext) {
         };
 
         let result = bld.call(start_fn, &args, None);
-
-        if use_start_lang_item {
-            bld.ret_void();
-        } else {
-            bld.ret(bld.intcast(result, Type::c_int(ccx), true));
-        }
+        bld.ret(bld.intcast(result, Type::c_int(ccx), true));
     }
 }
 

diff --git a/src/libstd/rt.rs b/src/libstd/rt.rs
@@ -30,19 +30,18 @@ pub use panicking::{begin_panic, begin_panic_fmt, update_panic_count};
 // the real work.
 #[cfg(not(any(test, stage0)))]
 fn lang_start_internal(main: &(Fn() -> i32 + Sync + ::panic::RefUnwindSafe),
-                       argc: isize, argv: *const *const u8) -> ! {
+                       argc: isize, argv: *const *const u8) -> isize {
     use panic;
     use sys;
     use sys_common;
     use sys_common::thread_info;
     use thread::Thread;
-    use process;
     #[cfg(not(feature = "backtrace"))]
     use mem;
 
     sys::init();
 
-    process::exit(unsafe {
+    unsafe {
         let main_guard = sys::thread::guard::init();
         sys::stack_overflow::init();
 
@@ -65,14 +64,14 @@ fn lang_start_internal(main: &(Fn() -> i32 + Sync + ::panic::RefUnwindSafe),
         let exit_code = panic::catch_unwind(move || main());
 
         sys_common::cleanup();
-        exit_code.unwrap_or(101)
-    });
+        exit_code.unwrap_or(101) as isize
+    }
 }
 
 #[cfg(not(any(test, stage0)))]
 #[lang = "start"]
 fn lang_start<T: ::termination::Termination + 'static>
-    (main: fn() -> T, argc: isize, argv: *const *const u8) -> !
+    (main: fn() -> T, argc: isize, argv: *const *const u8) -> isize
 {
     lang_start_internal(&move || main().report(), argc, argv)
 }