diff --git a/lld/test/wasm/debuginfo.test b/lld/test/wasm/debuginfo.test
index 9cb1cc31e515a..79be57e87b0c9 100644
--- a/lld/test/wasm/debuginfo.test
+++ b/lld/test/wasm/debuginfo.test
@@ -46,7 +46,7 @@ CHECK-NEXT:              DW_AT_name	("hi_foo.c")
 
 CHECK:   DW_TAG_variable
 CHECK-NEXT:                DW_AT_name	("y")
-CHECK-NEXT:                DW_AT_type	(0x000000ac "int[2]")
+CHECK-NEXT:                DW_AT_type	(0x000000ac "int [2]")
 CHECK-NEXT:                DW_AT_external	(true)
 CHECK-NEXT:                DW_AT_decl_file	("{{.*}}hi_foo.c")
 CHECK-NEXT:                DW_AT_decl_line	(1)
@@ -68,7 +68,7 @@ CHECK-NEXT:                DW_AT_encoding	(DW_ATE_unsigned)
 
 CHECK:   DW_TAG_variable
 CHECK-NEXT:                DW_AT_name	("z")
-CHECK-NEXT:                DW_AT_type	(0x000000ac "int[2]")
+CHECK-NEXT:                DW_AT_type	(0x000000ac "int [2]")
 CHECK-NEXT:                DW_AT_external	(true)
 CHECK-NEXT:                DW_AT_decl_file	("{{.*}}hi_foo.c")
 CHECK-NEXT:                DW_AT_decl_line	(8)
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
index 338f58db5a9e0..535a2e280b22c 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
@@ -180,16 +180,14 @@ static void dumpPointerLikeTypeBefore(raw_ostream &OS, DWARFDie D, DWARFDie Inne
 }
 
 static DWARFDie dumpTypeNameBefore(raw_ostream &OS, DWARFDie D, bool *Word) {
+  if (Word)
+    *Word = true;
   if (!D) {
     OS << "void";
-    if (Word)
-      *Word = true;
     return DWARFDie();
   }
   if (const char *Name = D.getName(DINameKind::LinkageName)) {
     OS << Name;
-    if (Word)
-      *Word = true;
     return DWARFDie();
   }
 
diff --git a/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test b/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test
index f1ff35a57df36..e5586018d68e8 100644
--- a/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test
+++ b/llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test
@@ -95,7 +95,7 @@
 # DWARF32-NEXT:                    DW_AT_name    ("__func__")
 # DWARF32-NEXT:                    DW_AT_decl_file       ("/basic.c")
 # DWARF32-NEXT:                    DW_AT_decl_line       (0)
-# DWARF32-NEXT:                    DW_AT_type    (0x0000005a "const char[5]")
+# DWARF32-NEXT:                    DW_AT_type    (0x0000005a "const char [5]")
 # DWARF32:       0x00000096:     NULL
 # DWARF32:       0x00000097:   NULL
 # DWARF32:       .debug_line contents: