Apply fix to refcount

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2758,12 +2758,8 @@ bool Converter::VisitInitListExpr(clang::InitListExpr *expr) {
       StrCat(token::kComma);
     }
   } else {
-    if (expr->getNumInits() == 1 && qual_type->isArrayType() &&
-        qual_type->getArrayElementTypeNoTypeQual()->isCharType() &&
-        clang::isa<clang::StringLiteral>(
-            expr->getInit(0)->IgnoreParenImpCasts())) {
-      auto *init = expr->getInit(0);
-      ConvertVarInit(init->getType(), init);
+    if (IsInitExprOfStringLiteral(expr)) {
+      Convert(expr->getInit(0)->IgnoreParenImpCasts());
       return false;
     }
     PushBracket bracket(*this);

cpp2rust/converter/converter_lib.cpp

@@ -255,6 +255,14 @@ bool IsAsciiStringLiteral(const clang::StringLiteral *str) {
   return true;
 }
 
+bool IsInitExprOfStringLiteral(const clang::InitListExpr *expr) {
+  auto type = expr->getType();
+  return expr->getNumInits() == 1 && type->isArrayType() &&
+         type->getArrayElementTypeNoTypeQual()->isCharType() &&
+         clang::isa<clang::StringLiteral>(
+             expr->getInit(0)->IgnoreParenImpCasts());
+}
+
 std::vector<clang::CXXConstructorDecl *>
 GetTemplateInstantiatedCtors(clang::CXXRecordDecl *decl) {
   std::vector<clang::CXXConstructorDecl *> out;

cpp2rust/converter/converter_lib.h

@@ -67,6 +67,8 @@ bool IsCallToOstream(clang::CallExpr *expr);
 
 bool IsAsciiStringLiteral(const clang::StringLiteral *str);
 
+bool IsInitExprOfStringLiteral(const clang::InitListExpr *expr);
+
 std::vector<clang::CXXConstructorDecl *>
 GetTemplateInstantiatedCtors(clang::CXXRecordDecl *decl);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -1397,6 +1397,12 @@ bool ConverterRefCount::VisitInitListExpr(clang::InitListExpr *expr) {
     return false;
   }
 
+  if (IsInitExprOfStringLiteral(expr)) {
+    Convert(expr->getInit(0)->IgnoreParenImpCasts());
+    computed_expr_type_ = ComputedExprType::FreshValue;
+    return false;
+  }
+
   auto conv = getConversionKind();
   // 2D arrays are FullRefCount'ed on the second level as well.
   PushConversionKind push(