diff options
| author | Pavel Labath <labath@google.com> | 2018-01-17 14:40:25 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2018-01-17 14:40:25 +0000 |
| commit | b424de390ee3fe95c7a84bed3114feea941407b5 (patch) | |
| tree | cd6eb4b20d2f17ab73b5ec122210ad3b187fe3c8 /lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp | |
| parent | f2c29571da7165420c7de600b220fb416ce8c73d (diff) | |
| download | bcm5719-llvm-b424de390ee3fe95c7a84bed3114feea941407b5.tar.gz bcm5719-llvm-b424de390ee3fe95c7a84bed3114feea941407b5.zip | |
Fix assertion in ObjectFileELF
In D40616 I (mistakenly) assumed that logging an llvm::Error would clear
it. This of course is only true if logging is actually enabled.
This fixes the assertion by manually clearing the error, but it raises
the point of whether we need a special error-clearing logging primitive.
llvm-svn: 322664
Diffstat (limited to 'lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp')
| -rw-r--r-- | lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index 36027dde043..433a2297aa9 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -3493,6 +3493,7 @@ size_t ObjectFileELF::ReadSectionData(Section *section, if (!Decompressor) { LLDB_LOG(log, "Unable to initialize decompressor for section {0}: {1}", section->GetName(), llvm::toString(Decompressor.takeError())); + consumeError(Decompressor.takeError()); return result; } auto buffer_sp = @@ -3502,6 +3503,7 @@ size_t ObjectFileELF::ReadSectionData(Section *section, size_t(buffer_sp->GetByteSize())})) { LLDB_LOG(log, "Decompression of section {0} failed: {1}", section->GetName(), llvm::toString(std::move(Error))); + consumeError(std::move(Error)); return result; } section_data.SetData(buffer_sp); |

