shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added path::home_directory, path::documents_directory, path::videos_directory, path::pictures_directory, path::desktop_directory, path::screenshots_directory,

Browse Source 
`path::public_share_directory`, `path::templates_directory`, `path::saved_games_directory`, `path::music_directory`, `path::downloads_directory`.
  Fix codegen bug in expressions like `foo(x()) ?? io::EOF?` causing irregular crashes.
This commit is contained in:
Christoffer Lerno
2025-09-04 21:34:34 +02:00
committed by Christoffer Lerno
parent cbd415881b
commit 69b3263a00
17 changed files with 342 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/compiler/llvm_codegen_expr.c
View File

@@ -3858,7 +3858,10 @@ static void llvm_emit_else(GenContext *c, BEValue *be_value, Expr *expr)
// Only jump to phi if we didn't have an immediate jump. That would
// for example happen on "{| defer foo(); return Foo.ERR?; |} ?? 123"
if (success_end_block) llvm_emit_br(c, phi_block);
if (success_end_block)
{
if (!llvm_emit_br(c, phi_block)) success_end_block = NULL;
}
// Emit else
llvm_emit_block(c, else_block);
@@ -3881,27 +3884,28 @@ static void llvm_emit_else(GenContext *c, BEValue *be_value, Expr *expr)
}
}
// If there wasn't a success, then we end here, even if the else was a jump.
if (!success_end_block)
{
*be_value = else_value;
return;
}
LLVMBasicBlockRef else_block_exit = llvm_get_current_block_if_in_use(c);
// While the value may not be an optional, we may get a jump
// from this construction: foo() ?? (bar()?)
// In this case the else block is empty.
if (!else_block_exit)
if (!else_block_exit || !llvm_emit_br(c, phi_block))
{
llvm_emit_block(c, phi_block);
*be_value = real_value;
return;
}
llvm_emit_br(c, phi_block);
llvm_emit_block(c, phi_block);
// Was there never a success, if so the result is the be_value.
if (!success_end_block)
{
*be_value = else_value;
return;
}
assert(success_end_block && else_block_exit);
// Emit an address if the phi is was by address
if (was_address)