---

yaml
---
r: 12523
b: refs/heads/master
c: 9604544
h: refs/heads/master
i:
  12521: d8a3e42
  12519: f1f35f0
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 75cf13ec7279ff7a56e3329ab6d6d8fc03e66e4f
+refs/heads/master: 9604544e234b30673ffe1bbcd24809e91bd39867
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_upcall.cpp

@@ -71,8 +71,8 @@ upcall_call_shim_on_c_stack(void *args, void *fn_ptr) {
     try {
         task->call_on_c_stack(args, fn_ptr);
     } catch (...) {
-        LOG_ERR(task, task, "Native code threw an exception");
-        abort();
+        // Logging here is not reliable
+        assert(false && "Native code threw an exception");
     }
 
     task->record_stack_limit();
@@ -96,9 +96,8 @@ upcall_call_shim_on_rust_stack(void *args, void *fn_ptr) {
     } catch (...) {
         // We can't count on being able to unwind through arbitrary
         // code. Our best option is to just fail hard.
-        LOG_ERR(task, task,
-                "Rust task failed after reentering the Rust stack");
-        abort();
+        // Logging here is not reliable
+        assert(false && "Rust task failed after reentering the Rust stack");
     }
 
     // FIXME: As above