commit 70def12a967508c93ed466af80b77031e522d796
author Paul Robinson <paul.robinson@sony.com> Thu Feb 22 21:03:33 2018 +0000
committer Paul Robinson <paul.robinson@sony.com> Thu Feb 22 21:03:33 2018 +0000
tree 3ce9b4efb62aa8cb833ce5b6521d9a70d9e7d048
parent fd6fcbc0063876e14cbb52bac2902d570b4e28b2

[DWARFv5] Turn an assert into a diagnostic. Hand-coded assembler files
should not trigger assertions.

Differential Revision: https://reviews.llvm.org/D43152

llvm-svn: 325831

llvm/lib/MC/MCStreamer.cpp

diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp
index a2c58e6..ab6fd9c 100644
--- a/llvm/lib/MC/MCStreamer.cpp
+++ b/llvm/lib/MC/MCStreamer.cpp
@@ -188,11 +188,10 @@
   emitFill(NumBytes, 0);
 }
 
-unsigned MCStreamer::EmitDwarfFileDirective(unsigned FileNo,
-                                            StringRef Directory,
-                                            StringRef Filename,
-                                            MD5::MD5Result *Checksum,
-                                            unsigned CUID) {
+Expected<unsigned>
+MCStreamer::tryEmitDwarfFileDirective(unsigned FileNo, StringRef Directory,
+                                      StringRef Filename,
+                                      MD5::MD5Result *Checksum, unsigned CUID) {
   return getContext().getDwarfFile(Directory, Filename, FileNo, Checksum, CUID);
 }