Add explicit rule for sockaddr

Author: lucic71

cpp2rust/cpp_rule_preprocessor.cpp

@@ -109,14 +109,15 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
       }
       return;
     }
-    if (auto var = R.Nodes.getNodeAs<clang::TypeAliasDecl>("tvar")) {
-      clang::QualType type;
-      if (auto *tdecl = var->getDescribedAliasTemplate()) {
-        type = lookupType(tdecl);
-      } else {
-        type = var->getUnderlyingType();
+    if (auto var = R.Nodes.getNodeAs<clang::TypedefNameDecl>("tvar")) {
+      clang::QualType type = var->getUnderlyingType();
+      if (auto *alias = llvm::dyn_cast<clang::TypeAliasDecl>(var)) {
+        if (auto *tdecl = alias->getDescribedAliasTemplate()) {
+          type = lookupType(tdecl);
+        }
       }
-      out_.try_emplace(var->getQualifiedNameAsString(), Mapper::ToString(type));
+      auto src = Mapper::ToString(type, Mapper::ScalarSugar::kPreserve);
+      out_.try_emplace(var->getQualifiedNameAsString(), std::move(src));
       return;
     }
 
@@ -707,7 +708,7 @@ class ActionFactory : public clang::tooling::FrontendActionFactory {
         &cb_);
 
     finder_.addMatcher(
-        typeAliasDecl(matchesName("(^|::)t[0-9]+$"), isExpansionInMainFile())
+        typedefNameDecl(matchesName("(^|::)t[0-9]+$"), isExpansionInMainFile())
             .bind("tvar"),
         &cb_);
 

rules/socket/src.c

@@ -2,6 +2,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+typedef struct sockaddr t1;
+
 int f1() {
   return MSG_NOSIGNAL;
 }

rules/socket/tgt_unsafe.rs

@@ -1,3 +1,7 @@
+fn t1() -> libc::sockaddr {
+    unsafe { std::mem::zeroed() }
+}
+
 unsafe fn f1() -> i32 {
     libc::MSG_NOSIGNAL
 }

tests/unit/out/unsafe/libc_struct_without_default.rs

@@ -23,12 +23,12 @@ impl Default for UserDefined {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct FieldIsLibcType {
-    pub addr: sockaddr,
+    pub addr: libc::sockaddr,
 }
 impl Default for FieldIsLibcType {
     fn default() -> Self {
         FieldIsLibcType {
-            addr: unsafe { std::mem::zeroed::<sockaddr>() },
+            addr: unsafe { std::mem::zeroed() },
         }
     }
 }
@@ -59,7 +59,7 @@ unsafe fn main_0() -> i32 {
     st.st_size = 1024_i64;
     assert!(((st.st_size) == (1024_i64)));
     let mut ud: UserDefined = <UserDefined>::default();
-    assert!(((ud.a[(0_usize)]) == (0)));
+    assert!(((ud.a[(0_usize) as usize]) == (0)));
     assert!(((ud.v.len()) == (0_usize)));
     let mut filt: FieldIsLibcType = <FieldIsLibcType>::default();
     assert!(((filt.addr.sa_family as i32) == (0)));

tests/unit/out/unsafe/socket_transparent_union.rs

@@ -18,7 +18,7 @@ unsafe fn main_0() -> i32 {
     assert!(
         ((((libc::getsockname(
             fd,
-            ((&mut ssloc as *mut sockaddr_storage) as *mut sockaddr),
+            ((&mut ssloc as *mut sockaddr_storage) as *mut libc::sockaddr),
             (&mut slen as *mut u32)
         )) == (-1_i32)) as i32)
             != 0)
@@ -28,7 +28,7 @@ unsafe fn main_0() -> i32 {
     assert!(
         ((((libc::getsockname(
             fd,
-            ((&mut sin as *mut sockaddr_in) as *mut sockaddr),
+            ((&mut sin as *mut sockaddr_in) as *mut libc::sockaddr),
             (&mut inlen as *mut u32)
         )) == (-1_i32)) as i32)
             != 0)