commit e3d81fdf6f019c4774f8f513d880fcdd4f3a0239
author George Rimar <grimar@accesssoftek.com> Fri Aug 09 10:53:12 2019 +0000
committer George Rimar <grimar@accesssoftek.com> Fri Aug 09 10:53:12 2019 +0000
tree 53edacd88216b454b9bd53ab1f7a35a3afdb8991
parent ac42e741e01b0c2d91c3ae1d92a5b9685a05baf7

[llvm-readobj] - Remove deprecated unwrapOrError(Expected<T> EO).

This patch changes the code to use a modern unwrapOrError(StringRef Input, Expected<T> EO)
version that contains the input source name and removes the deprecated version.

Differential revision: https://reviews.llvm.org/D65946

llvm-svn: 368428

llvm/tools/llvm-readobj/MachODumper.cpp

diff --git a/llvm/tools/llvm-readobj/MachODumper.cpp b/llvm/tools/llvm-readobj/MachODumper.cpp
index 32a3866..17883df 100644
--- a/llvm/tools/llvm-readobj/MachODumper.cpp
+++ b/llvm/tools/llvm-readobj/MachODumper.cpp
@@ -484,7 +484,8 @@
     }
 
     if (opts::SectionData && !Section.isBSS())
-      W.printBinaryBlock("SectionData", unwrapOrError(Section.getContents()));
+      W.printBinaryBlock("SectionData", unwrapOrError(Obj->getFileName(),
+                                                      Section.getContents()));
   }
 }
 
@@ -653,7 +654,8 @@
   if (StackMapSection == object::SectionRef())
     return;
 
-  StringRef StackMapContents = unwrapOrError(StackMapSection.getContents());
+  StringRef StackMapContents =
+      unwrapOrError(Obj->getFileName(), StackMapSection.getContents());
   ArrayRef<uint8_t> StackMapContentsArray =
       arrayRefFromStringRef(StackMapContents);