language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-03 19:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Eliminate Stmt::RuntimeError in favor of crash

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-22 18:08:33 -06:00
parent a2f2a18a76
commit 803d7e30e3
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
14 changed files with 115 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/compiler/test_gen/src/helpers/llvm.rs
View file

@ -8,7 +8,7 @@ use roc_collections::all::MutSet;
use roc_gen_llvm::llvm::externs::add_default_roc_externs;
use roc_gen_llvm::{llvm::build::LlvmBackendMode, run_roc::RocCallResult};
use roc_load::{EntryPoint, ExecutionMode, LoadConfig, Threading};
use roc_mono::ir::OptLevel;
use roc_mono::ir::{CrashTag, OptLevel};
use roc_region::all::LineInfo;
use roc_reporting::report::{RenderTarget, DEFAULT_PALETTE};
use roc_utils::zig;
@ -547,7 +547,7 @@ macro_rules! assert_wasm_evals_to {
pub fn try_run_lib_function<T>(
main_fn_name: &str,
lib: &libloading::Library,
) -> Result<T, (String, u32)> {
) -> Result<T, (String, CrashTag)> {
unsafe {
let main: libloading::Symbol<unsafe extern "C" fn(*mut RocCallResult<T>)> = lib
.get(main_fn_name.as_bytes())
@ -568,6 +568,7 @@ macro_rules! assert_llvm_evals_to {
use bumpalo::Bump;
use inkwell::context::Context;
use roc_gen_llvm::llvm::build::LlvmBackendMode;
use roc_mono::ir::CrashTag;
let arena = Bump::new();
let context = Context::create();
@ -598,9 +599,8 @@ macro_rules! assert_llvm_evals_to {
std::mem::forget(given);
}
Err((msg, tag)) => match tag {
0 => panic!(r#"Roc failed with message: "{}""#, msg),
1 => panic!(r#"User crash with message: "{}""#, msg),
_ => panic!(r#"Got an invalid panic tag: "{}""#, tag),
CrashTag::Roc => panic!(r#"Roc failed with message: "{}""#, msg),
CrashTag::User => panic!(r#"User crash with message: "{}""#, msg),
},
}

9
crates/compiler/test_gen/src/helpers/platform_functions.rs
View file

@ -1,5 +1,6 @@
use core::ffi::c_void;
use roc_mono::ir::CrashTag;
use roc_std::RocStr;
/// # Safety
@ -39,14 +40,12 @@ pub unsafe fn roc_dealloc(c_ptr: *mut c_void, _alignment: u32) {
/// The Roc application needs this.
#[no_mangle]
pub unsafe fn roc_panic(msg: &RocStr, tag_id: u32) {
use roc_gen_llvm::llvm::build::PanicTagId;
match PanicTagId::try_from(tag_id) {
Ok(PanicTagId::RocPanic) => {
match CrashTag::try_from(tag_id) {
Ok(CrashTag::Roc) => {
eprintln!("Roc hit a panic: {}", msg);
std::process::exit(1);
}
Ok(PanicTagId::UserPanic) => {
Ok(CrashTag::User) => {
eprintln!("User panic: {}", msg);
std::process::exit(1);
}