mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 11:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor follow-up improvements to PR #19227 for aro translate-c

Browse Source
This commit is contained in:
february cozzocrea 2024-05-16 15:33:44 -07:00 committed by Andrew Kelley
parent 4239a0d9c3
commit d67d9fa357
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/compiler/aro_translate_c.zig
View File

@ -376,7 +376,7 @@ fn transRecordDecl(c: *Context, scope: *Scope, record_node: NodeIndex, field_nod
const has_alignment_attributes = record_decl.field_attributes != null or const has_alignment_attributes = record_decl.field_attributes != null or
raw_record_ty.hasAttribute(.@"packed") or raw_record_ty.hasAttribute(.@"packed") or
raw_record_ty.hasAttribute(.aligned); raw_record_ty.hasAttribute(.aligned);
const head_field_alignment: ?c_uint = headFieldAlignment(record_decl); const head_field_alignment: ?c_uint = if (has_alignment_attributes) headFieldAlignment(record_decl) else null;
// Iterate over field nodes so that we translate any type decls included in this record decl. // Iterate over field nodes so that we translate any type decls included in this record decl.
// TODO: Move this logic into `fn transType()` instead of handling decl translation here. // TODO: Move this logic into `fn transType()` instead of handling decl translation here.
@ -734,8 +734,14 @@ fn headFieldAlignment(record_decl: *const Type.Record) ?c_uint {
} }
} }
/// This function returns a ?c_uint to match Clang's behaviour of using c_uint. /// This function inspects the generated layout of a record to determine the alignment for a
/// This can be changed to a u29 after the Clang frontend for translate-c is removed. /// particular field. This approach is necessary because unlike Zig, a C compiler is not
/// required to fulfill the requested alignment, which means we'd risk generating different code
/// if we only look at the user-requested alignment.
///
/// Returns a ?c_uint to match Clang's behaviour of using c_uint. The return type can be changed
/// after the Clang frontend for translate-c is removed. A null value indicates that a field is
/// 'naturally aligned'.
fn alignmentForField( fn alignmentForField(
record_decl: *const Type.Record, record_decl: *const Type.Record,
head_field_alignment: ?c_uint, head_field_alignment: ?c_uint,