From 3e75e7ec08f52c88300ac7f3a92ca0275660838f Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Fri, 22 Apr 2011 18:53:17 +0200
Subject: [PATCH] Merged DMD commit 8999f902485d9930332010aeb9db6d44b16bcd4c:
 Brad's fix for fail278 regression

---
 dmd/mangle.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dmd/mangle.c b/dmd/mangle.c
index 54186f57..ca26961c 100644
--- a/dmd/mangle.c
+++ b/dmd/mangle.c
@@ -216,7 +216,6 @@ char *ClassDeclaration::mangle()
 char *TemplateInstance::mangle()
 {
     OutBuffer buf;
-    char *id;
 
 #if 0
     printf("TemplateInstance::mangle() %s", toChars());
@@ -224,16 +223,19 @@ char *TemplateInstance::mangle()
         printf("  parent = %s %s", parent->kind(), parent->toChars());
     printf("\n");
 #endif
-    id = ident ? ident->toChars() : toChars();
-    Dsymbol *par = isnested || isTemplateMixin() ? parent : tempdecl->parent;
+    char *id = ident ? ident->toChars() : toChars();
     if (!tempdecl)
         error("is not defined");
-    else if (par)
+    else
     {
-        char *p = par->mangle();
-        if (p[0] == '_' && p[1] == 'D')
-            p += 2;
-        buf.writestring(p);
+        Dsymbol *par = isnested || isTemplateMixin() ? parent : tempdecl->parent;
+        if (par)
+        {
+            char *p = par->mangle();
+            if (p[0] == '_' && p[1] == 'D')
+                p += 2;
+            buf.writestring(p);
+        }
     }
     buf.printf("%zu%s", strlen(id), id);
     id = buf.toChars();