diff --git a/lib/CodeGen/AsmPrinter/DIEHash.cpp b/lib/CodeGen/AsmPrinter/DIEHash.cpp
index c56d2e64730..abc504c0581 100644
--- a/lib/CodeGen/AsmPrinter/DIEHash.cpp
+++ b/lib/CodeGen/AsmPrinter/DIEHash.cpp
@@ -383,6 +383,9 @@ void DIEHash::computeHash(DIE *Die) {
                                           E = Die->getChildren().end();
        I != E; ++I)
     computeHash(*I);
+
+  // Following the last (or if there are no children), append a zero byte.
+  Hash.update((uint8_t)0);
 }
 
 /// This is based on the type signature computation given in section 7.27 of the
diff --git a/unittests/CodeGen/DIEHashTest.cpp b/unittests/CodeGen/DIEHashTest.cpp
index 6b9a4dbc26a..86358d5d31a 100644
--- a/unittests/CodeGen/DIEHashTest.cpp
+++ b/unittests/CodeGen/DIEHashTest.cpp
@@ -23,6 +23,6 @@ TEST(DIEHashData1Test, DIEHash) {
   DIEInteger Size(4);
   Die.addValue(dwarf::DW_AT_byte_size, dwarf::DW_FORM_data1, &Size);
   uint64_t MD5Res = Hash.computeTypeSignature(&Die);
-  ASSERT_EQ(MD5Res, 0x540e9ff30ade3e4aULL);
+  ASSERT_EQ(MD5Res, 0x4F68EF1039F8D2BULL);
 }
 }