commit e4bc65f256a4216561bc13a1544b37010bd03f14
author Pirama Arumuga Nainar <pirama@google.com> Wed Oct 26 17:35:50 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 26 17:35:52 2016 +0000
tree 0f52e797bf36bba483cece407699f579a2989db0
parent baa61a89951e635bd5d2ab23865d4c4b109449c8
parent acd5ff97d9547e14594bb367357cb354348c70c1

Merge "Make libbacktrace build with LLVM r275480"

libbacktrace/BacktraceOffline.cpp

diff --git a/libbacktrace/BacktraceOffline.cpp b/libbacktrace/BacktraceOffline.cpp
index c2b68bc..a05a6d8 100644
--- a/libbacktrace/BacktraceOffline.cpp
+++ b/libbacktrace/BacktraceOffline.cpp
@@ -719,7 +719,7 @@
   auto binary_or_err = llvm::object::createBinary(buffer_or_err.get()->getMemBufferRef());
   if (!binary_or_err) {
     BACK_LOGW("failed to create binary for %s in %s: %s", elf_file.c_str(), apk_file.c_str(),
-              binary_or_err.getError().message().c_str());
+              llvm::toString(binary_or_err.takeError()).c_str());
     return nothing;
   }
   return llvm::object::OwningBinary<llvm::object::Binary>(std::move(binary_or_err.get()),