From f36bb6d5298cf51ec505d38152858a4b4d3241a0 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 6 Jun 2023 09:04:05 +0000
Subject: [PATCH] Make unimplemented trap messages show up in more contexts

---
 src/trap.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/trap.rs b/src/trap.rs
index 82a2ec579549..2fb0c2164c30 100644
--- a/src/trap.rs
+++ b/src/trap.rs
@@ -30,5 +30,9 @@ fn codegen_print(fx: &mut FunctionCx<'_, '_, '_>, msg: &str) {
 /// Trap code: user65535
 pub(crate) fn trap_unimplemented(fx: &mut FunctionCx<'_, '_, '_>, msg: impl AsRef<str>) {
     codegen_print(fx, msg.as_ref());
+
+    let one = fx.bcx.ins().iconst(types::I32, 1);
+    fx.lib_call("exit", vec![AbiParam::new(types::I32)], vec![], &[one]);
+
     fx.bcx.ins().trap(TrapCode::User(!0));
 }