aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/MC/MCStreamer.cpp
diff options
context:
space:
mode:
authorPaul Robinson <paul.robinson@sony.com>2018-02-22 21:03:33 +0000
committerPaul Robinson <paul.robinson@sony.com>2018-02-22 21:03:33 +0000
commit70def12a967508c93ed466af80b77031e522d796 (patch)
tree3ce9b4efb62aa8cb833ce5b6521d9a70d9e7d048 /llvm/lib/MC/MCStreamer.cpp
parentfd6fcbc0063876e14cbb52bac2902d570b4e28b2 (diff)
downloadllvm-70def12a967508c93ed466af80b77031e522d796.zip
llvm-70def12a967508c93ed466af80b77031e522d796.tar.gz
llvm-70def12a967508c93ed466af80b77031e522d796.tar.bz2
[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
Diffstat (limited to 'llvm/lib/MC/MCStreamer.cpp')
-rw-r--r--llvm/lib/MC/MCStreamer.cpp9
1 files changed, 4 insertions, 5 deletions
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 @@ void MCStreamer::EmitZeros(uint64_t NumBytes) {
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);
}