From 343e13def012dcfb7510362b6dd75c61b1125895 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 10 Jun 2020 13:56:20 +0100
Subject: [PATCH] Fix disassembly of DIDerivedType

---
 renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp b/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp
index 4c58386fa..0d18dcde0 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debuginfo.cpp
@@ -345,14 +345,13 @@ rdcstr DIBasicType::toString() const
 
 rdcstr DIDerivedType::toString() const
 {
-  rdcstr ret = StringFormat::Fmt("!DIDerivedType(tag: %s, name: %s", ToStr(tag).c_str(),
-                                 escapeString(name ? *name : rdcstr()).c_str());
+  rdcstr ret = StringFormat::Fmt("!DIDerivedType(tag: %s", ToStr(tag).c_str());
+  if(name)
+    ret += StringFormat::Fmt(", name: %s", escapeString(*name).c_str());
   if(scope)
     ret += StringFormat::Fmt(", scope: %s", scope->refString().c_str());
   if(file)
     ret += StringFormat::Fmt(", file: %s", file->refString().c_str());
-  else
-    ret += ", file: null";
   if(line)
     ret += StringFormat::Fmt(", line: %llu", line);
   if(base)