transpile: force UnTypeOps (sizeof, alignof, etc.) to be CTypeKind::Size (size_t)

Author: kkysen

c2rust-transpile/src/c_ast/mod.rs

@@ -887,6 +887,19 @@ impl TypedAstContext {
                         CExprKind::Paren(_ty, e) => {
                             self.ast_context.c_exprs[&e].kind.get_qual_type()
                         }
+                        CExprKind::UnaryType(_, op, _, _) => {
+                            // All of these `UnTypeOp`s should return `size_t`.
+                            let kind = match op {
+                                UnTypeOp::SizeOf => CTypeKind::Size,
+                                UnTypeOp::AlignOf => CTypeKind::Size,
+                                UnTypeOp::PreferredAlignOf => CTypeKind::Size,
+                            };
+                            let ty = self
+                                .ast_context
+                                .type_for_kind(&kind)
+                                .expect("CTypeKind::Size should be size_t");
+                            Some(CQualTypeId::new(ty))
+                        }
                         _ => return,
                     };
                     if let (Some(ty), Some(new_ty)) = (

c2rust-transpile/tests/snapshots/[email protected]

@@ -344,9 +344,7 @@ pub const ZSTD_WINDOWLOG_MAX_32: std::ffi::c_int = unsafe { 30 as std::ffi::c_in
 pub const ZSTD_WINDOWLOG_MAX_64: std::ffi::c_int = unsafe { 31 as std::ffi::c_int };
 #[no_mangle]
 pub unsafe extern "C" fn test_zstd() -> U64 {
-    return (if ::core::mem::size_of::<zstd_platform_dependent_type>() as std::ffi::c_ulong
-        == 4 as std::ffi::c_ulong
-    {
+    return (if ::core::mem::size_of::<zstd_platform_dependent_type>() as usize == 4 as usize {
         ZSTD_WINDOWLOG_MAX_32
     } else {
         ZSTD_WINDOWLOG_MAX_64
@@ -413,7 +411,7 @@ pub unsafe extern "C" fn size_of_const() -> std::ffi::c_int {
     let mut a: [std::ffi::c_int; 10] = [0; 10];
     return SIZE as std::ffi::c_int;
 }
-pub const SIZE: std::ffi::c_ulong = unsafe { ::core::mem::size_of::<[std::ffi::c_int; 10]>() };
+pub const SIZE: usize = unsafe { ::core::mem::size_of::<[std::ffi::c_int; 10]>() };
 unsafe extern "C" fn run_static_initializers() {
     global_static_const_ptr_arithmetic = PTR_ARITHMETIC;
     global_static_const_indexing =