Fix abort and _abort to be different

wasmerio · Dec 2, 2019 · e8b162d · e8b162d
1 parent cd946f1
commit e8b162d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/lib/emscripten/src/exception.rs b/lib/emscripten/src/exception.rs
@@ -33,7 +33,7 @@ pub fn ___cxa_rethrow_primary_exception(_ctx: &mut Ctx, _a: u32) {
 pub fn ___cxa_throw(ctx: &mut Ctx, _ptr: u32, _ty: u32, _destructor: u32) {
     debug!("emscripten::___cxa_throw");
     eprintln!("Throwing exceptions not yet implemented: aborting!");
-    _abort(ctx, 0);
+    _abort(ctx);
 }
 
 pub fn ___cxa_begin_catch(_ctx: &mut Ctx, _exception_object_ptr: u32) -> i32 {

diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs
@@ -731,7 +731,7 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
         "___syscall345" => func!(crate::syscalls::___syscall345),
 
         // Process
-        "abort" => func!(crate::process::_abort),
+        "abort" => func!(crate::process::em_abort),
         "_abort" => func!(crate::process::_abort),
         "_prctl" => func!(crate::process::_prctl),
         "abortStackOverflow" => func!(crate::process::abort_stack_overflow),

diff --git a/lib/emscripten/src/process.rs b/lib/emscripten/src/process.rs
@@ -10,14 +10,18 @@ use wasmer_runtime_core::vm::Ctx;
 pub fn abort_with_message(ctx: &mut Ctx, message: &str) {
     debug!("emscripten::abort_with_message");
     println!("{}", message);
-    _abort(ctx, 0);
+    _abort(ctx);
 }
 
-pub fn _abort(_ctx: &mut Ctx, arg: u32) {
+/// The name of this call is `abort` but we want to avoid conflicts with libc::abort
+pub fn em_abort(ctx: &mut Ctx, arg: u32) {
+    debug!("emscripten::abort");
+    eprintln!("Program aborted with value {}", arg);
+    _abort(ctx);
+}
+
+pub fn _abort(_ctx: &mut Ctx) {
     debug!("emscripten::_abort");
-    if arg != 0 {
-        eprintln!("Program aborted with value {}", arg);
-    }
     unsafe {
         abort();
     }