Skip to content

transpile: Don't use named reference for binary conditionals #1765

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

Closed
Rua wants to merge 1 commit into from
Closed

transpile: Don't use named reference for binary conditionals #1765

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
37 changes: 23 additions & 14 deletions c2rust-transpile/src/translator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3729,9 +3729,10 @@ impl<'c> Translation<'c> {
}

BinaryConditional(ty, lhs, rhs) => {
let rhs = self.convert_expr(ctx, rhs, None)?;

if ctx.is_unused() {
let mut lhs = self.convert_condition(ctx, false, lhs)?;
let rhs = self.convert_expr(ctx, rhs, None)?;
lhs.merge_unsafe(rhs.is_unsafe());

lhs.and_then(|val| {
Expand All @@ -3747,19 +3748,27 @@ impl<'c> Translation<'c> {
))
})
} else {
self.name_reference_write_read(ctx, lhs)?.result_map(
|NamedReference {
rvalue: lhs_val, ..
}| {
let cond = self.match_bool(ctx, true, ty.ctype, lhs_val.clone())?;
let ite = mk().ifte_expr(
cond,
mk().block(vec![mk().expr_stmt(lhs_val)]),
Some(self.convert_expr(ctx, rhs, None)?.to_expr()),
);
Ok(ite)
},
)
let mut lhs = self.convert_expr(ctx.used(), lhs, None)?;
lhs.merge_unsafe(rhs.is_unsafe());
let fresh_name = self.renamer.borrow_mut().fresh();

lhs.and_then(|lhs| {
let fresh_stmt = mk().local_stmt(Box::new(mk().local(
mk().ident_pat(&fresh_name),
None,
Some(lhs),
)));

let cond =
self.match_bool(ctx, true, ty.ctype, mk().ident_expr(&fresh_name))?;
let ite = mk().ifte_expr(
cond,
mk().block(vec![mk().expr_stmt(mk().ident_expr(&fresh_name))]),
Some(rhs.to_expr()),
);

Ok(WithStmts::new(vec![fresh_stmt], ite))
})
}
}

Expand Down
Loading