Index: test/tools/dsymutil/X86/null-die.test
===================================================================
--- /dev/null
+++ test/tools/dsymutil/X86/null-die.test
@@ -0,0 +1,39 @@
+#RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -no-output 2>&1 \
+#RUN:   |  FileCheck %s
+
+# CHECK: warning: could not find referenced DIE
+
+# We've modified the DW_AT_abstract_origin offset to reference a NULL DIE.
+#
+# Source:
+#
+#   int foo(int i) __attribute__((always_inline));
+#   int foo(int i)
+#   {
+#     return i + 10;
+#   }
+#
+#   int main(int argc, char** argv)
+#   {
+#     return foo(argc);
+#   }
+#
+# Compile with:
+#
+#   $ clang -S -O3 -g test.c -o null_die.s
+#
+#   Manually patch the DW_AT_abstract_origin to point to a NULL DIE.
+#
+#   $ llvm-mc -triple x86_64-apple-darwin -filetype=obj -o null_die.o null_die.s
+#   $ ld -arch x86_64 -macosx_version_min 10.13.0 -lSystem null_die.o -o null_die
+
+---
+triple:          'x86_64-apple-darwin'
+binary-path:     ../llvm-dsymutil-crash/test/tools/dsymutil/Inputs/null_die
+objects:
+  - filename:        /null_die.o
+    timestamp:       1505906803
+    symbols:
+      - { sym: _foo, objAddr: 0x0000000000000000, binAddr: 0x0000000100000F30, size: 0x00000010 }
+      - { sym: _main, objAddr: 0x0000000000000010, binAddr: 0x0000000100000F40, size: 0x00000009 }
+...
Index: tools/dsymutil/DwarfLinker.cpp
===================================================================
--- tools/dsymutil/DwarfLinker.cpp
+++ tools/dsymutil/DwarfLinker.cpp
@@ -1495,8 +1495,12 @@
   uint64_t RefOffset = *RefValue.getAsReference();
 
   if ((RefCU = getUnitForOffset(Units, RefOffset)))
-    if (const auto RefDie = RefCU->getOrigUnit().getDIEForOffset(RefOffset))
-      return RefDie;
+    if (const auto RefDie = RefCU->getOrigUnit().getDIEForOffset(RefOffset)) {
+      // In a file with broken references, an attribute might point to a NULL
+      // DIE.
+      if(!RefDie.isNULL())
+        return RefDie;
+    }
 
   Linker.reportWarning("could not find referenced DIE", &DIE);
   return DWARFDie();