user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass Option<Span> to codegen_unwind_terminate

Browse source 
In preparation for unwinding support.
This commit is contained in:
bjorn3 2025-04-24 13:02:28 +00:00
parent 0103c583fa
commit eef57cb4e2
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/base.rs
View file

@ -566,7 +566,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
);
}
TerminatorKind::UnwindTerminate(reason) => {
codegen_unwind_terminate(fx, source_info, *reason);
codegen_unwind_terminate(fx, Some(source_info.span), *reason);
}
TerminatorKind::UnwindResume => {
// FIXME implement unwinding
@ -1117,18 +1117,10 @@ pub(crate) fn codegen_panic_nounwind<'tcx>(
pub(crate) fn codegen_unwind_terminate<'tcx>(
fx: &mut FunctionCx<'_, '_, 'tcx>,
source_info: mir::SourceInfo,
span: Option<Span>,
reason: UnwindTerminateReason,
) {
let args = [];
codegen_panic_inner(
fx,
reason.lang_item(),
&args,
UnwindAction::Terminate(UnwindTerminateReason::Abi),
Some(source_info.span),
);
codegen_panic_inner(fx, reason.lang_item(), &[], UnwindAction::Unreachable, span);
}
fn codegen_panic_inner<'tcx>(

1
src/compiler_builtins.rs
View file

@ -67,5 +67,4 @@ builtin_functions! {
fn malloc(size: size_t) -> *mut c_void;
fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
fn free(p: *mut c_void) -> ();
}