newell
/
nac3
forked from M-Labs/nac3
1
0
Fork 0
Code Pull Requests Activity

rename exception symbols

This commit is contained in:
Sebastien Bourdeauducq 2022-02-23 11:04:35 +08:00
parent 6ae770d5eb
commit 17792b76b7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nac3core/src/codegen/stmt.rs
View File

@ -426,16 +426,16 @@ pub fn get_builtins<'ctx, 'a, G: CodeGenerator>(
) -> FunctionValue<'ctx> { ) -> FunctionValue<'ctx> {
ctx.module.get_function(symbol).unwrap_or_else(|| { ctx.module.get_function(symbol).unwrap_or_else(|| {
let ty = match symbol { let ty = match symbol {
"__artiq_raise" => ctx "__nac3_raise" => ctx
.ctx .ctx
.void_type() .void_type()
.fn_type(&[ctx.get_llvm_type(generator, ctx.primitives.exception).into()], false), .fn_type(&[ctx.get_llvm_type(generator, ctx.primitives.exception).into()], false),
"__artiq_resume" => ctx.ctx.void_type().fn_type(&[], false), "__nac3_resume" => ctx.ctx.void_type().fn_type(&[], false),
"__artiq_end_catch" => ctx.ctx.void_type().fn_type(&[], false), "__nac3_end_catch" => ctx.ctx.void_type().fn_type(&[], false),
_ => unimplemented!(), _ => unimplemented!(),
}; };
let fun = ctx.module.add_function(symbol, ty, None); let fun = ctx.module.add_function(symbol, ty, None);
if symbol == "__artiq_raise" || symbol == "__artiq_resume" { if symbol == "__nac3_raise" || symbol == "__nac3_resume" {
fun.add_attribute( fun.add_attribute(
AttributeLoc::Function, AttributeLoc::Function,
ctx.ctx.create_enum_attribute(Attribute::get_named_enum_kind_id("noreturn"), 1), ctx.ctx.create_enum_attribute(Attribute::get_named_enum_kind_id("noreturn"), 1),
@ -557,11 +557,11 @@ pub fn gen_raise<'ctx, 'a, G: CodeGenerator>(
ctx.builder.build_store(name_ptr, fun_name); ctx.builder.build_store(name_ptr, fun_name);
} }
let raise = get_builtins(generator, ctx, "__artiq_raise"); let raise = get_builtins(generator, ctx, "__nac3_raise");
let exception = *exception; let exception = *exception;
ctx.build_call_or_invoke(raise, &[exception], "raise"); ctx.build_call_or_invoke(raise, &[exception], "raise");
} else { } else {
let resume = get_builtins(generator, ctx, "__artiq_resume"); let resume = get_builtins(generator, ctx, "__nac3_resume");
ctx.build_call_or_invoke(resume, &[], "resume"); ctx.build_call_or_invoke(resume, &[], "resume");
} }
ctx.builder.build_unreachable(); ctx.builder.build_unreachable();
@ -706,8 +706,8 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>(
&mut redirect_lambda &mut redirect_lambda
as &mut dyn FnMut(&mut CodeGenContext<'ctx, 'a>, BasicBlock<'ctx>, BasicBlock<'ctx>) as &mut dyn FnMut(&mut CodeGenContext<'ctx, 'a>, BasicBlock<'ctx>, BasicBlock<'ctx>)
}; };
let resume = get_builtins(generator, ctx, "__artiq_resume"); let resume = get_builtins(generator, ctx, "__nac3_resume");
let end_catch = get_builtins(generator, ctx, "__artiq_end_catch"); let end_catch = get_builtins(generator, ctx, "__nac3_end_catch");
if let Some((continue_target, break_target)) = ctx.loop_target.take() { if let Some((continue_target, break_target)) = ctx.loop_target.take() {
let break_proxy = ctx.ctx.append_basic_block(current_fun, "try.break"); let break_proxy = ctx.ctx.append_basic_block(current_fun, "try.break");
let continue_proxy = ctx.ctx.append_basic_block(current_fun, "try.continue"); let continue_proxy = ctx.ctx.append_basic_block(current_fun, "try.continue");

2
nac3core/src/toplevel/composer.rs
View File

@ -145,7 +145,7 @@ impl TopLevelComposer {
self.unifier.get_shared_unifier(), self.unifier.get_shared_unifier(),
self.primitives_ty, self.primitives_ty,
)])), )])),
personality_symbol: Some("__artiq_personality".into()), personality_symbol: Some("__nac3_personality".into()),
} }
} }