Revert "replace"

This reverts commit f43e346897.
This commit is contained in:
eiei114 2023-06-25 17:50:05 +09:00
parent f43e346897
commit c1d4a18c00
No known key found for this signature in database
GPG Key ID: C740FAA53EE7B995
5 changed files with 552 additions and 654 deletions

1182
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -30,7 +30,6 @@ roc_reporting = { path = "../reporting" }
roc_std = { path = "../roc_std" }
roc_target = { path = "../compiler/roc_target" }
roc_types = { path = "../compiler/types" }
roc_error_macros = { path = "../error_macros" }
bumpalo.workspace = true
const_format.workspace = true

View File

@ -3,7 +3,6 @@ use inkwell::context::Context;
use libloading::Library;
use roc_build::link::llvm_module_to_dylib;
use roc_collections::all::MutSet;
use roc_error_macros::internal_error;
use roc_gen_llvm::llvm::build::LlvmBackendMode;
use roc_gen_llvm::llvm::externs::add_default_roc_externs;
use roc_gen_llvm::{run_jit_function, run_jit_function_dynamic_type};
@ -264,7 +263,7 @@ fn mono_module_to_dylib<'a>(
if main_fn.verify(true) {
function_pass.run_on(&main_fn);
} else {
internal_error!("Main function {} failed LLVM verification in build. Uncomment things nearby to see more details.", main_fn_name);
panic!("Main function {} failed LLVM verification in build. Uncomment things nearby to see more details.", main_fn_name);
}
module_pass.run_on(env.module);
@ -274,7 +273,10 @@ fn mono_module_to_dylib<'a>(
// Verify the module
if let Err(errors) = env.module.verify() {
internal_error!("Errors defining module:\n{}", errors.to_string());
panic!(
"Errors defining module:\n{}\n\nUncomment things nearby to see more details.",
errors.to_string()
);
}
llvm_module_to_dylib(env.module, &target, opt_level)

View File

@ -93,7 +93,6 @@ pub fn get_values<'a>(
mod test {
use indoc::indoc;
use pretty_assertions::assert_eq;
use roc_error_macros::internal_error;
use roc_gen_llvm::{llvm::build::LlvmBackendMode, run_roc::RocCallResult, run_roc_dylib};
use roc_load::{ExecutionMode, LoadConfig, LoadMonomorphizedError, Threading};
use roc_packaging::cache::RocCacheDir;
@ -137,9 +136,9 @@ mod test {
) {
Ok(m) => m,
Err(LoadMonomorphizedError::ErrorModule(m)) => {
internal_error!("{:?}", (m.can_problems, m.type_problems))
panic!("{:?}", (m.can_problems, m.type_problems))
}
Err(e) => internal_error!("{e:?}"),
Err(e) => panic!("{e:?}"),
};
let mut loaded = loaded;

View File

@ -327,7 +327,7 @@ fn run_expect_fx<'a, W: std::io::Write>(
try_run_jit_function!(lib, expect.name, (), |v: ()| v);
if let Err((msg, _)) = result {
internal_error!("roc panic {}", msg);
panic!("roc panic {}", msg);
}
if sequence.count_failures() > 0 {
@ -518,7 +518,7 @@ fn render_dbg_failure<'a>(
let data = expectations.get_mut(&module_id).unwrap();
let current = match data.dbgs.get(&dbg_symbol) {
None => internal_error!("region {failure_region:?} not in list of dbgs"),
None => panic!("region {failure_region:?} not in list of dbgs"),
Some(current) => current,
};
let failure_region = current.region;
@ -565,7 +565,7 @@ fn render_expect_failure<'a>(
let data = expectations.get_mut(&module_id).unwrap();
let current = match data.expectations.get(&failure_region) {
None => internal_error!("region {failure_region:?} not in list of expects"),
None => panic!("region {failure_region:?} not in list of expects"),
Some(current) => current,
};
@ -638,7 +638,7 @@ impl ExpectSequence {
0 => std::hint::spin_loop(),
1 => break ChildProcessMsg::Expect,
2 => break ChildProcessMsg::Dbg,
n => internal_error!("invalid atomic value set by the child: {:#x}", n),
n => panic!("invalid atomic value set by the child: {:#x}", n),
}
}
}
@ -815,7 +815,7 @@ pub fn expect_mono_module_to_dylib<'a>(
if let Err(errors) = env.module.verify() {
let path = std::env::temp_dir().join("test.ll");
env.module.print_to_file(&path).unwrap();
internal_error!(
panic!(
"Errors defining module:\n{}\n\nUncomment things nearby to see more details. IR written to `{:?}`",
errors.to_string(), path,
);