Skip to content

transpile: Pass correct types when translating prefix inc/dec operators #1689

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
Rua wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −7
Open

transpile: Pass correct types when translating prefix inc/dec operators #1689

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
28 changes: 21 additions & 7 deletions c2rust-transpile/src/translator/operators.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,12 @@ impl<'c> Translation<'c> {
} else {
c_ast::BinOp::AssignSubtract
};

let arg_type = self.ast_context[arg]
.kind
.get_qual_type()
.ok_or_else(|| format_err!("bad arg type"))?;

let one = match self.ast_context.resolve_type(ty.ctype).kind {
// TODO: If rust gets f16 support:
// CTypeKind::Half |
Expand All @@ -749,19 +755,27 @@ impl<'c> Translation<'c> {
}
_ => mk().lit_expr(mk().int_unsuffixed_lit(1)),
};
let arg_type = self.ast_context[arg]
.kind
.get_qual_type()
.ok_or_else(|| format_err!("bad arg type"))?;

let one_type_id =
if let CTypeKind::Pointer(..) = self.ast_context.resolve_type(arg_type.ctype).kind {
CQualTypeId::new(
self.ast_context
.type_for_kind(&CTypeKind::Int)
.ok_or_else(|| format_err!("couldn't find type for CTypeKind::Int"))?,
)
} else {
arg_type
};

self.convert_assignment_operator_with_rhs(
ctx.used(),
op,
arg_type,
arg,
ty,
arg,
one_type_id,
WithStmts::new_val(one),
Some(arg_type),
Some(arg_type),
Some(ty),
)
}

Expand Down
Loading