Fix array to pointer decay for libc members

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1942,9 +1942,18 @@ bool Converter::VisitImplicitCastExpr(clang::ImplicitCastExpr *expr) {
       Convert(sub_expr);
       break;
     }
-    Convert(sub_expr);
     bool dest_pointee_const =
         expr->getType()->getPointeeType().isConstQualified();
+    if (const auto *member = clang::dyn_cast<clang::MemberExpr>(
+            sub_expr->IgnoreParenImpCasts());
+        member && IsCharArrayFieldFromLibc(member->getMemberDecl())) {
+      PushParen paren(*this);
+      Convert(sub_expr);
+      StrCat(dest_pointee_const ? ".as_ptr()" : ".as_mut_ptr()");
+      StrCat(keyword::kAs, dest_pointee_const ? "*const u8" : "*mut u8");
+      break;
+    }
+    Convert(sub_expr);
     if (clang::isa<clang::StringLiteral>(sub_expr) ||
         clang::isa<clang::PredefinedExpr>(sub_expr)) {
       StrCat(".as_ptr()");

cpp2rust/converter/converter_lib.cpp

@@ -139,6 +139,16 @@ bool IsCharPointerFieldFromLibc(const clang::ValueDecl *decl) {
       field->getParent()->getLocation());
 }
 
+bool IsCharArrayFieldFromLibc(const clang::ValueDecl *decl) {
+  auto field = clang::dyn_cast<clang::FieldDecl>(decl);
+  if (!field || !field->getType()->isArrayType() ||
+      !field->getType()->getArrayElementTypeNoTypeQual()->isCharType()) {
+    return false;
+  }
+  return field->getASTContext().getSourceManager().isInSystemHeader(
+      field->getParent()->getLocation());
+}
+
 bool IsUserDefinedDecl(const clang::Decl *decl) {
   const auto &ctx = decl->getASTContext();
   const auto &src_mgr = ctx.getSourceManager();

cpp2rust/converter/converter_lib.h

@@ -41,6 +41,8 @@ bool IsInMainFile(const clang::Decl *decl);
 
 bool IsCharPointerFieldFromLibc(const clang::ValueDecl *decl);
 
+bool IsCharArrayFieldFromLibc(const clang::ValueDecl *decl);
+
 bool IsUserDefinedDecl(const clang::Decl *decl);
 
 bool RefersToUserDefinedDecl(const clang::Expr *expr);