Skip to content

transpile: Factor out more pointer-related functions #1521

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 4 commits into
base: master
Choose a base branch
from
Open

transpile: Factor out more pointer-related functions #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d027ef3
transpile: Split off new functions for pointer casts
Rua Dec 18, 2025
9d65d79
transpile: Simplify and refactor pointer cast functions
Rua Jan 19, 2026
5e06039
transpile: Factor out `convert_pointer_is_null`
Rua Jan 19, 2026
750fb81
transpile: Refactor `convert_pointer_is_null`
Rua Mar 6, 2026
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
169 changes: 31 additions & 138 deletions c2rust-transpile/src/translator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2723,68 +2723,44 @@ impl<'c> Translation<'c> {
.ok_or_else(|| format_err!("bad condition type"))?;

let null_pointer_case =
|negated: bool, ptr: CExprId| -> TranslationResult<WithStmts<Box<Expr>>> {
|ptr: CExprId, is_null: bool| -> TranslationResult<WithStmts<Box<Expr>>> {
let val = self.convert_expr(ctx.used().decay_ref(), ptr, None)?;
let ptr_type = self.ast_context[ptr]
.kind
.get_type()
.ok_or_else(|| format_err!("bad pointer type for condition"))?;
val.and_then(|e| {
Ok(WithStmts::new_val(
if self.ast_context.is_function_pointer(ptr_type) {
if negated {
mk().method_call_expr(e, "is_some", vec![])
} else {
mk().method_call_expr(e, "is_none", vec![])
}
} else {
// TODO: `pointer::is_null` becomes stably const in Rust 1.84.
if ctx.is_const {
return Err(format_translation_err!(
None,
"cannot check nullity of pointer in `const` context",
));
}
let is_null = mk().method_call_expr(e, "is_null", vec![]);
if negated {
mk().unary_expr(UnOp::Not(Default::default()), is_null)
} else {
is_null
}
},
))
})

val.result_map(|val| self.convert_pointer_is_null(ctx, ptr_type, val, is_null))
};

match self.ast_context[cond_id].kind {
CExprKind::Binary(_, c_ast::BinOp::EqualEqual, null_expr, ptr, _, _)
if self.ast_context.is_null_expr(null_expr) =>
{
null_pointer_case(!target, ptr)
null_pointer_case(ptr, target)
}

CExprKind::Binary(_, c_ast::BinOp::EqualEqual, ptr, null_expr, _, _)
if self.ast_context.is_null_expr(null_expr) =>
{
null_pointer_case(!target, ptr)
null_pointer_case(ptr, target)
}

CExprKind::Binary(_, c_ast::BinOp::NotEqual, null_expr, ptr, _, _)
if self.ast_context.is_null_expr(null_expr) =>
{
null_pointer_case(target, ptr)
null_pointer_case(ptr, !target)
}

CExprKind::Binary(_, c_ast::BinOp::NotEqual, ptr, null_expr, _, _)
if self.ast_context.is_null_expr(null_expr) =>
{
null_pointer_case(target, ptr)
null_pointer_case(ptr, !target)
}

CExprKind::Unary(_, c_ast::UnOp::Not, subexpr_id, _) => {
self.convert_condition(ctx, !target, subexpr_id)
}

_ => {
// DecayRef could (and probably should) be Default instead of Yes here; however, as noted
// in https://github.com/rust-lang/rust/issues/53772, you cant compare a reference (lhs) to
Expand Down Expand Up @@ -4526,79 +4502,35 @@ impl<'c> Translation<'c> {

match kind {
CastKind::BitCast | CastKind::NoOp => {
if self.ast_context.is_function_pointer(target_cty.ctype)
|| self.ast_context.is_function_pointer(source_cty.ctype)
{
let source_ty = self
.type_converter
.borrow_mut()
.convert(&self.ast_context, source_cty.ctype)?;
let target_ty = self
.type_converter
.borrow_mut()
.convert(&self.ast_context, target_cty.ctype)?;

if source_ty == target_ty {
return Ok(val);
}

self.import_type(source_cty.ctype);
self.import_type(target_cty.ctype);

val.and_then(|val| {
Ok(WithStmts::new_unsafe_val(transmute_expr(
source_ty, target_ty, val,
)))
})
} else {
// Normal case
let target_ty = self.convert_type(target_cty.ctype)?;
Ok(val.map(|val| mk().cast_expr(val, target_ty)))
}
self.convert_pointer_to_pointer_cast(source_cty.ctype, target_cty.ctype, val)
}

CastKind::IntegralToPointer
if self.ast_context.is_function_pointer(target_cty.ctype) =>
{
let target_ty = self.convert_type(target_cty.ctype)?;
val.and_then(|x| {
self.use_crate(ExternCrate::Libc);
let intptr_t = mk().abs_path_ty(vec!["libc", "intptr_t"]);
let intptr = mk().cast_expr(x, intptr_t.clone());
if ctx.is_const {
return Err(format_translation_err!(
None,
"cannot transmute integers to Option<fn ...> in `const` context",
));
}
Ok(WithStmts::new_unsafe_val(transmute_expr(
intptr_t, target_ty, intptr,
)))
})
CastKind::IntegralToPointer => {
self.convert_integral_to_pointer_cast(ctx, source_cty.ctype, target_cty.ctype, val)
}

CastKind::IntegralToPointer
| CastKind::PointerToIntegral
| CastKind::IntegralCast
CastKind::PointerToIntegral => self.convert_pointer_to_integral_cast(
ctx,
source_cty.ctype,
target_cty.ctype,
val,
expr,
),

CastKind::IntegralCast
| CastKind::FloatingCast
| CastKind::FloatingToIntegral
| CastKind::IntegralToFloating
| CastKind::BooleanToSignedIntegral => {
if kind == CastKind::PointerToIntegral && ctx.is_const {
return Err(format_translation_err!(
None,
"cannot observe pointer values in `const` context",
));
}
let target_ty = self.convert_type(target_cty.ctype)?;
let source_ty = self.convert_type(source_cty.ctype)?;

if let CTypeKind::LongDouble = target_ty_kind {
if ctx.is_const {
return Err(format_translation_err!(
None,
"f128 cannot be used in constants because `f128::f128::new` is not `const`",
));
None,
"f128 cannot be used in constants because \
`f128::f128::new` is not `const`",
));
}

self.use_crate(ExternCrate::F128);
Expand All @@ -4621,35 +4553,13 @@ impl<'c> Translation<'c> {
)
})
} else if target_ty_kind.is_floating_type() && source_ty_kind.is_bool() {
val.and_then(|x| {
Ok(WithStmts::new_val(mk().cast_expr(
mk().cast_expr(x, mk().path_ty(vec!["u8"])),
target_ty,
)))
})
} else if target_ty_kind.is_pointer() && source_ty_kind.is_bool() {
val.and_then(|x| {
self.use_crate(ExternCrate::Libc);
Ok(WithStmts::new_val(mk().cast_expr(
mk().cast_expr(x, mk().abs_path_ty(vec!["libc", "size_t"])),
target_ty,
)))
})
Ok(val.map(|val| {
mk().cast_expr(mk().cast_expr(val, mk().path_ty(vec!["u8"])), target_ty)
}))
} else if let &CTypeKind::Enum(..) = source_ty_kind {
val.result_map(|val| self.convert_cast_from_enum(target_cty.ctype, val))
} else {
// Other numeric casts translate to Rust `as` casts,
// unless the cast is to a function pointer then use `transmute`.
val.and_then(|x| {
if self.ast_context.is_function_pointer(source_cty.ctype) {
Ok(WithStmts::new_unsafe_val(transmute_expr(
source_ty, target_ty, x,
)))
} else if let &CTypeKind::Enum(..) = source_ty_kind {
self.convert_cast_from_enum(target_cty.ctype, x)
.map(WithStmts::new_val)
} else {
Ok(WithStmts::new_val(mk().cast_expr(x, target_ty)))
}
})
Ok(val.map(|val| mk().cast_expr(val, target_ty)))
}
}

Expand Down Expand Up @@ -4981,25 +4891,8 @@ impl<'c> Translation<'c> {
) -> TranslationResult<Box<Expr>> {
let ty = &self.ast_context.resolve_type(ty_id).kind;

Ok(if self.ast_context.is_function_pointer(ty_id) {
if target {
mk().method_call_expr(val, "is_some", vec![])
} else {
mk().method_call_expr(val, "is_none", vec![])
}
} else if ty.is_pointer() {
// TODO: `pointer::is_null` becomes stably const in Rust 1.84.
if ctx.is_const {
return Err(format_translation_err!(
None,
"cannot check nullity of pointer in `const` context",
));
}
let mut res = mk().method_call_expr(val, "is_null", vec![]);
if target {
res = mk().unary_expr(UnOp::Not(Default::default()), res)
}
res
Ok(if ty.is_pointer() {
self.convert_pointer_is_null(ctx, ty_id, val, !target)?
} else if ty.is_bool() {
if target {
val
Expand Down
54 changes: 18 additions & 36 deletions c2rust-transpile/src/translator/operators.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ impl<'c> Translation<'c> {
.and_then(|rhs_val| {
let expr_ids = Some((lhs, rhs));
self.convert_binary_operator(
ctx,
op,
ty,
expr_type_id.ctype,
Expand Down Expand Up @@ -235,6 +236,7 @@ impl<'c> Translation<'c> {
};
let ty = self.convert_type(compute_res_type_id.ctype)?;
let mut val = self.convert_binary_operator(
ctx,
bin_op,
ty,
compute_res_type_id.ctype,
Expand Down Expand Up @@ -456,6 +458,7 @@ impl<'c> Translation<'c> {

let val = if expr_or_comp_type_id.ctype == initial_lhs_type_id.ctype {
self.convert_binary_operator(
ctx,
op,
ty,
expr_type_id.ctype,
Expand All @@ -472,6 +475,7 @@ impl<'c> Translation<'c> {
let lhs = mk().cast_expr(read.clone(), lhs_type);
let ty = self.convert_type(result_type_id.ctype)?;
let mut val = self.convert_binary_operator(
ctx,
op,
ty,
result_type_id.ctype,
Expand Down Expand Up @@ -570,6 +574,7 @@ impl<'c> Translation<'c> {
/// arguments be usable as rvalues.
fn convert_binary_operator(
&self,
ctx: ExprContext,
op: c_ast::BinOp,
ty: Box<Type>,
ctype: CTypeId,
Expand Down Expand Up @@ -611,46 +616,23 @@ impl<'c> Translation<'c> {
c_ast::BinOp::ShiftRight => mk().binary_expr(BinOp::Shr(Default::default()), lhs, rhs),
c_ast::BinOp::ShiftLeft => mk().binary_expr(BinOp::Shl(Default::default()), lhs, rhs),

c_ast::BinOp::EqualEqual => {
// Using is_none method for null comparison means we don't have to
// rely on the PartialEq trait as much and is also more idiomatic
let expr = if let Some((lhs_expr_id, rhs_expr_id)) = lhs_rhs_ids {
let fn_eq_null = self.ast_context.is_function_pointer(lhs_type.ctype)
&& self.ast_context.is_null_expr(rhs_expr_id);
let null_eq_fn = self.ast_context.is_function_pointer(rhs_type.ctype)
&& self.ast_context.is_null_expr(lhs_expr_id);

if fn_eq_null {
mk().method_call_expr(lhs, "is_none", vec![])
} else if null_eq_fn {
mk().method_call_expr(rhs, "is_none", vec![])
} else {
mk().binary_expr(BinOp::Eq(Default::default()), lhs, rhs)
}
// Using is_none method for null comparison means we don't have to
// rely on the PartialEq trait as much and is also more idiomatic
c_ast::BinOp::EqualEqual | c_ast::BinOp::NotEqual => {
let (negated, bin_op) = if let c_ast::BinOp::EqualEqual = op {
(true, BinOp::Eq(Default::default()))
} else {
mk().binary_expr(BinOp::Eq(Default::default()), lhs, rhs)
(false, BinOp::Ne(Default::default()))
};

bool_to_int(expr)
}
c_ast::BinOp::NotEqual => {
// Using is_some method for null comparison means we don't have to
// rely on the PartialEq trait as much and is also more idiomatic
let expr = if let Some((lhs_expr_id, rhs_expr_id)) = lhs_rhs_ids {
let fn_eq_null = self.ast_context.is_function_pointer(lhs_type.ctype)
&& self.ast_context.is_null_expr(rhs_expr_id);
let null_eq_fn = self.ast_context.is_function_pointer(rhs_type.ctype)
&& self.ast_context.is_null_expr(lhs_expr_id);

if fn_eq_null {
mk().method_call_expr(lhs, "is_some", vec![])
} else if null_eq_fn {
mk().method_call_expr(rhs, "is_some", vec![])
} else {
mk().binary_expr(BinOp::Ne(Default::default()), lhs, rhs)
let expr = match lhs_rhs_ids {
Some((lhs_expr_id, _)) if self.ast_context.is_null_expr(lhs_expr_id) => {
self.convert_pointer_is_null(ctx, rhs_type.ctype, rhs, negated)?
}
} else {
mk().binary_expr(BinOp::Ne(Default::default()), lhs, rhs)
Some((_, rhs_expr_id)) if self.ast_context.is_null_expr(rhs_expr_id) => {
self.convert_pointer_is_null(ctx, lhs_type.ctype, lhs, negated)?
}
_ => mk().binary_expr(bin_op, lhs, rhs),
};

bool_to_int(expr)
Expand Down
Loading