Check for decayed array to pointer types irregardless of templates

Author: joaotgouveia

cpp2rust/converter/translation_rule.cpp

@@ -163,6 +163,13 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
           type = var->getType();
         }
 
+        if (const auto *decayed = type->getAs<clang::DecayedType>()) {
+          clang::QualType original = decayed->getOriginalType();
+          if (original->isArrayType()) {
+            type = original;
+          }
+        }
+
         add(Mapper::ToString(type));
         return;
       }
@@ -716,15 +723,7 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
     clang::Sema::ContextRAII savedContext(*sema_, ns);
     clang::FunctionDecl *rule = instantiateRuleDecl(decl);
     assert(rule && "Rule resolution failed");
-
-    clang::QualType type = rule->getParamDecl(0)->getType();
-    if (const auto *decayed = type->getAs<clang::DecayedType>()) {
-      clang::QualType original = decayed->getOriginalType();
-      if (original->isArrayType()) {
-        return original;
-      }
-    }
-    return type;
+    return rule->getParamDecl(0)->getType();
   }
 };