diff options
| author | Fangrui Song <maskray@google.com> | 2019-05-16 13:24:04 +0000 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2019-05-16 13:24:04 +0000 |
| commit | e183340c29db62e3c93c59c403984ad675d72c83 (patch) | |
| tree | 21ec750631cf5febc8acfa3d2d6b35fc72538e96 /llvm/lib/XRay | |
| parent | 1b93a24c297117c455a126f1c3e858fefe410c2f (diff) | |
| download | llvm-e183340c29db62e3c93c59c403984ad675d72c83.zip llvm-e183340c29db62e3c93c59c403984ad675d72c83.tar.gz llvm-e183340c29db62e3c93c59c403984ad675d72c83.tar.bz2 | |
Recommit [Object] Change object::SectionRef::getContents() to return Expected<StringRef>
r360876 didn't fix 2 call sites in clang.
Expected<ArrayRef<uint8_t>> may be better but use Expected<StringRef> for now.
Follow-up of D61781.
llvm-svn: 360892
Diffstat (limited to 'llvm/lib/XRay')
| -rw-r--r-- | llvm/lib/XRay/InstrumentationMap.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/XRay/InstrumentationMap.cpp b/llvm/lib/XRay/InstrumentationMap.cpp index 862949f..2eeb455 100644 --- a/llvm/lib/XRay/InstrumentationMap.cpp +++ b/llvm/lib/XRay/InstrumentationMap.cpp @@ -78,9 +78,10 @@ loadObj(StringRef Filename, object::OwningBinary<object::ObjectFile> &ObjFile, "Failed to find XRay instrumentation map.", std::make_error_code(std::errc::executable_format_error)); - if (I->getContents(Contents)) - return errorCodeToError( - std::make_error_code(std::errc::executable_format_error)); + if (Expected<StringRef> E = I->getContents()) + Contents = *E; + else + return E.takeError(); RelocMap Relocs; if (ObjFile.getBinary()->isELF()) { |