Merge pull request #4050 from rainers/issue_13583

Fix Issue 13583: Inconsistent naming of template arguments in debug symbols
dlang · Oct 10, 2014 · 43175e1 · 43175e1
2 parents 0e47db1 + d6ce4ad
commit 43175e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/tocsym.c b/src/tocsym.c
@@ -191,7 +191,7 @@ Symbol *toSymbol(Dsymbol *s)
                      * It applies to PDB format, but should apply to CV as PDB derives from CV.
                      *    http://msdn.microsoft.com/en-us/library/ff553493(VS.85).aspx
                      */
-                    s->prettyIdent = vd->toPrettyChars();
+                    s->prettyIdent = vd->toPrettyChars(true);
                 }
                 else
                 {
@@ -290,7 +290,7 @@ Symbol *toSymbol(Dsymbol *s)
                 Symbol *s = symbol_calloc(id);
                 slist_add(s);
 
-                s->prettyIdent = fd->toPrettyChars();
+                s->prettyIdent = fd->toPrettyChars(true);
                 s->Sclass = SCglobal;
                 symbol_func(s);
                 func_t *f = s->Sfunc;

diff --git a/src/toctype.c b/src/toctype.c
@@ -214,7 +214,7 @@ class ToCtypeVisitor : public Visitor
         }
         else if (t->sym->memtype->toBasetype()->ty == Tint32)
         {
-            t->ctype = type_enum(t->sym->toPrettyChars(), Type_toCtype(t->sym->memtype));
+            t->ctype = type_enum(t->sym->toPrettyChars(true), Type_toCtype(t->sym->memtype));
             tm->ctype = t->ctype;
         }
         else
@@ -228,7 +228,7 @@ class ToCtypeVisitor : public Visitor
     void visit(TypeClass *t)
     {
         //printf("TypeClass::toCtype() %s\n", toChars());
-        type *tc = type_struct_class(t->sym->toPrettyChars(), t->sym->alignsize, t->sym->structsize,
+        type *tc = type_struct_class(t->sym->toPrettyChars(true), t->sym->alignsize, t->sym->structsize,
                 NULL,
                 NULL,
                 false,