Resolve typedefs before extracting dimensions

Author: sudo-panda

lib/Interpreter/CppInterOp.cpp

@@ -2713,6 +2713,9 @@ namespace Cpp {
   std::vector<long int> GetDimensions(TCppType_t type)
   {
     QualType Qual = QualType::getFromOpaquePtr(type);
+    if (Qual.isNull())
+      return {};
+    Qual = Qual.getCanonicalType();
     std::vector<long int> dims;
     if (Qual->isArrayType())
     {

unittests/CppInterOp/TypeReflectionTest.cpp

@@ -393,6 +393,12 @@ TEST(TypeReflectionTest, GetDimensions) {
       struct S2 {
         char ch[][3][4];
       };
+
+      template <typename T>
+      struct S3 {
+        typedef T type;
+      };
+      S3<int[6]>::type arr;
     )";
 
   GetAllTopLevelDecls(code, Decls);
@@ -454,6 +460,15 @@ TEST(TypeReflectionTest, GetDimensions) {
   {
     EXPECT_EQ(dims[i], truth_dims[i]);
   }
+
+  // Variable arr
+  dims = Cpp::GetDimensions(Cpp::GetVariableType(Decls[7]));
+  truth_dims = std::vector<long int>({6});
+  EXPECT_EQ(dims.size(), truth_dims.size());
+  for (unsigned i = 0; i < truth_dims.size() && i < dims.size(); i++)
+  {
+    EXPECT_EQ(dims[i], truth_dims[i]);
+  }
 }
 
 TEST(TypeReflectionTest, IsPODType) {