Index: llvm/trunk/lib/IR/Verifier.cpp
===================================================================
--- llvm/trunk/lib/IR/Verifier.cpp
+++ llvm/trunk/lib/IR/Verifier.cpp
@@ -55,6 +55,7 @@
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
@@ -967,8 +968,23 @@
 
 void Verifier::visitDIFile(const DIFile &N) {
   AssertDI(N.getTag() == dwarf::DW_TAG_file_type, "invalid tag", &N);
-  AssertDI((N.getChecksumKind() != DIFile::CSK_None ||
-            N.getChecksum().empty()), "invalid checksum kind", &N);
+  AssertDI(N.getChecksumKind() <= DIFile::CSK_Last, "invalid checksum kind",
+           &N);
+  size_t Size;
+  switch (N.getChecksumKind()) {
+  case DIFile::CSK_None:
+    Size = 0;
+    break;
+  case DIFile::CSK_MD5:
+    Size = 32;
+    break;
+  case DIFile::CSK_SHA1:
+    Size = 40;
+    break;
+  }
+  AssertDI(N.getChecksum().size() == Size, "invalid checksum length", &N);
+  AssertDI(N.getChecksum().find_if_not(llvm::isHexDigit) == StringRef::npos,
+           "invalid checksum", &N);
 }
 
 void Verifier::visitDICompileUnit(const DICompileUnit &N) {
Index: llvm/trunk/test/MC/AArch64/coff-debug.ll
===================================================================
--- llvm/trunk/test/MC/AArch64/coff-debug.ll
+++ llvm/trunk/test/MC/AArch64/coff-debug.ll
@@ -21,7 +21,7 @@
 !llvm.ident = !{!6}
 
 !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-!1 = !DIFile(filename: "a.c", directory: "/", checksumkind: CSK_MD5, checksum: "")
+!1 = !DIFile(filename: "a.c", directory: "/", checksumkind: CSK_MD5, checksum: "12345678901234567890123456789012")
 !2 = !{}
 !3 = !{i32 2, !"CodeView", i32 1}
 !4 = !{i32 2, !"Debug Info Version", i32 3}
@@ -102,9 +102,9 @@
 ; CHECK:   Subsection [
 ; CHECK:     SubSectionType: FileChecksums (0xF4)
 ; CHECK:     FileChecksum {
-; CHECK:       ChecksumSize: 0x0
+; CHECK:       ChecksumSize: 0x10
 ; CHECK:       ChecksumKind: MD5 (0x1)
-; CHECK:       ChecksumBytes: ()
+; CHECK:       ChecksumBytes: (12 34 56 78 90 12 34 56 78 90 12 34 56 78 90 12)
 ; CHECK:     }
 ; CHECK:   ]
 ; CHECK:   Subsection [
Index: llvm/trunk/test/Verifier/DIFile.ll
===================================================================
--- llvm/trunk/test/Verifier/DIFile.ll
+++ llvm/trunk/test/Verifier/DIFile.ll
@@ -0,0 +1,30 @@
+; RUN: llvm-as -disable-output < %s 2>&1 | FileCheck %s
+
+; The lengths for None and MD5 are wrong; SHA1 has a non-hex digit.
+; CHECK: invalid checksum length
+; CHECK: invalid checksum{{$}}
+; CHECK: invalid checksum length
+; CHECK: warning: ignoring invalid debug info in <stdin>
+
+@t1 = global i32 1, align 4, !dbg !0
+@t2 = global i32 0, align 4, !dbg !6
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!11, !12, !13}
+!llvm.ident = !{!14}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "t1", scope: !2, file: !10, line: 1, type: !9, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 7.0.0 (trunk 322159)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5)
+!3 = !DIFile(filename: "t.c", directory: "/scratch", checksumkind: CSK_None, checksum: "00")
+!4 = !{}
+!5 = !{!0, !6}
+!6 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
+!7 = distinct !DIGlobalVariable(name: "t2", scope: !2, file: !8, line: 1, type: !9, isLocal: false, isDefinition: true)
+!8 = !DIFile(filename: "./t2.h", directory: "/scratch", checksumkind: CSK_MD5, checksum: "2222")
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DIFile(filename: "./t1.h", directory: "/scratch", checksumkind: CSK_SHA1, checksum: "123456789012345678901234567890123456789.")
+!11 = !{i32 2, !"Dwarf Version", i32 4}
+!12 = !{i32 2, !"Debug Info Version", i32 3}
+!13 = !{i32 1, !"wchar_size", i32 4}
+!14 = !{!"clang version 7.0.0 (trunk 322159)"}