Skip to content

remove duplicate returns in end of function #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove duplicate returns in end of function #292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/codegen/gas_x86_64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ pub unsafe fn load_arg_to_reg(arg: Arg, reg: *const c_char,output: *mut String_B
}

pub unsafe fn generate_function(name: *const c_char, name_loc: Loc, func_index: usize, params_count: usize, auto_vars_count: usize, body: *const [OpWithLocation], scope_events: *const [ScopeEvent], debug: bool, output: *mut String_Builder, os: Os) {
let mut returned = false;
let stack_size = align_bytes(auto_vars_count * 8, 16);
match os {
Os::Linux | Os::Windows => {
Expand Down Expand Up @@ -113,6 +114,7 @@ pub unsafe fn generate_function(name: *const c_char, name_loc: Loc, func_index:

let mut proccessed_scope_events = 0;
for i in 0..body.len() {
returned = false;
let op = (*body)[i];

if debug {
Expand Down Expand Up @@ -142,6 +144,7 @@ pub unsafe fn generate_function(name: *const c_char, name_loc: Loc, func_index:
match op.opcode {
Op::Bogus => unreachable!("bogus-amogus"),
Op::Return { arg } => {
returned = true;
if let Some(arg) = arg {
load_arg_to_reg(arg, c!("rax"), output, os);
}
Expand Down Expand Up @@ -298,10 +301,12 @@ pub unsafe fn generate_function(name: *const c_char, name_loc: Loc, func_index:
},
}
}
sb_appendf(output, c!(" movq $0, %%rax\n"));
sb_appendf(output, c!(" movq %%rbp, %%rsp\n"));
sb_appendf(output, c!(" popq %%rbp\n"));
sb_appendf(output, c!(" ret\n"));
if !returned {
sb_appendf(output, c!(" movq $0, %%rax\n"));
sb_appendf(output, c!(" movq %%rbp, %%rsp\n"));
sb_appendf(output, c!(" popq %%rbp\n"));
sb_appendf(output, c!(" ret\n"));
}

if debug {
sb_appendf(output, c!(" .cfi_endproc\n"));
Expand Down