Merge pull request #1634 from rainers/cv8_darray

fix cv8 array debug info

src/backend/cgcv.c

@@ -374,6 +374,11 @@ idx_t cv_debtyp(debtyp_t *d)
     return debtyptop++ + cgcv.deb_offset;
 }
 
+idx_t cv_numdebtypes()
+{
+    return debtyptop;
+}
+
 /****************************
  * Store a null record at DEB_NULL.
  */

src/backend/cgcv.h

@@ -64,6 +64,7 @@ int cv_namestring ( unsigned char *p , const char *name );
 unsigned cv4_typidx(type *t);
 idx_t cv4_arglist(type *t,unsigned *pnparam);
 unsigned char cv4_callconv(type *t);
+idx_t cv_numdebtypes();
 
 #define TOIDX(a,b)      ((cgcv.sz_idx == 4) ? TOLONG(a,b) : TOWORD(a,b))
 

src/backend/cv8.c

@@ -801,7 +801,7 @@ idx_t cv8_darray(type *t, idx_t etypidx)
             break;
 
         default:
-            id = "dArray";
+            id = t->Tident ? t->Tident : "dArray";
             break;
     }
 
@@ -815,7 +815,12 @@ idx_t cv8_darray(type *t, idx_t etypidx)
     TOWORD(d->data + 18, 16);   // size
     cv_namestring(d->data + 20, id);
 
-    return cv_debtyp(d);
+    idx_t top = cv_numdebtypes();
+    idx_t debidx = cv_debtyp(d);
+    if(top != cv_numdebtypes())
+        cv8_udt(id, debidx);
+
+    return debidx;
 }
 
 /****************************************

src/toctype.c

@@ -67,7 +67,10 @@ type *TypeSArray::toCtype()
 type *TypeDArray::toCtype()
 {
     if (!ctype)
+    {
         ctype = type_dyn_array(next->toCtype());
+        ctype->Tident = toChars(); // needed to generate sensible debug info for cv8
+    }
     return ctype;
 }