diff --git a/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp b/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp
--- a/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp
@@ -1417,6 +1417,9 @@
     }
 
     auto EntryNames = getNames(DIE);
+    // If the entry has no name, its name in the table will be "".
+    if (EntryNames.empty())
+      EntryNames.push_back("");
     if (!is_contained(EntryNames, Str)) {
       error() << formatv("Name Index @ {0:x}: Entry @ {1:x}: mismatched Name "
                          "of DIE @ {2:x}: index - {3}; debug_info - {4}.\n",
diff --git a/llvm/test/DebugInfo/Generic/debug-names-nameless-var.ll b/llvm/test/DebugInfo/Generic/debug-names-nameless-var.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/DebugInfo/Generic/debug-names-nameless-var.ll
@@ -0,0 +1,23 @@
+; RUN: %llc_dwarf -debugger-tune=lldb -accel-tables=Dwarf -filetype=obj -o %t %s
+; RUN: llvm-dwarfdump -debug-names %t | FileCheck %s
+; RUN: llvm-dwarfdump -debug-names -verify %t | FileCheck --check-prefix=VERIFY %s
+
+@nameless_var = constant i8 0, !dbg !0
+
+; CHECK: Name count: 1
+; CHECK: String: 0x{{[0-9a-f]*}} ""
+; VERIFY: No errors
+
+!llvm.dbg.cu = !{!10}
+!llvm.module.flags = !{!14, !15}
+!llvm.ident = !{!20}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(scope: null, file: !11, line: 1, type: !5, isLocal: true, isDefinition: true)
+!5 = !DIBasicType(size: 8, encoding: DW_ATE_signed_char)
+!10 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !11, producer: "blah", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !12, splitDebugInlining: false, nameTableKind: Apple, sysroot: "/")
+!11 = !DIFile(filename: "blah", directory: "blah")
+!12 = !{!0}
+!14 = !{i32 7, !"Dwarf Version", i32 5}
+!15 = !{i32 2, !"Debug Info Version", i32 3}
+!20 = !{!"blah"}