diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-03-20 11:40:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:43:05 +0000 |
| commit | 349cc55c9796c4596a5b9904cd3281af295f878f (patch) | |
| tree | 410c5a785075730a35f1272ca6a7adf72222ad03 /contrib/llvm-project/llvm/lib/XRay/InstrumentationMap.cpp | |
| parent | cb2ae6163174b90e999326ecec3699ee093a5d43 (diff) | |
| parent | c0981da47d5696fe36474fcf86b4ce03ae3ff818 (diff) | |
Diffstat (limited to 'contrib/llvm-project/llvm/lib/XRay/InstrumentationMap.cpp')
| -rw-r--r-- | contrib/llvm-project/llvm/lib/XRay/InstrumentationMap.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/contrib/llvm-project/llvm/lib/XRay/InstrumentationMap.cpp b/contrib/llvm-project/llvm/lib/XRay/InstrumentationMap.cpp index e6534e5a7be7..c60efa465bb6 100644 --- a/contrib/llvm-project/llvm/lib/XRay/InstrumentationMap.cpp +++ b/contrib/llvm-project/llvm/lib/XRay/InstrumentationMap.cpp @@ -86,10 +86,8 @@ loadObj(StringRef Filename, object::OwningBinary<object::ObjectFile> &ObjFile, "Failed to find XRay instrumentation map.", std::make_error_code(std::errc::executable_format_error)); - if (Expected<StringRef> E = I->getContents()) - Contents = *E; - else - return E.takeError(); + if (Error E = I->getContents().moveInto(Contents)) + return E; RelocMap Relocs; if (ObjFile.getBinary()->isELF()) { @@ -190,7 +188,7 @@ loadObj(StringRef Filename, object::OwningBinary<object::ObjectFile> &ObjFile, SledEntry::FunctionKinds::TAIL, SledEntry::FunctionKinds::LOG_ARGS_ENTER, SledEntry::FunctionKinds::CUSTOM_EVENT}; - if (Kind >= sizeof(Kinds)) + if (Kind >= sizeof(Kinds) / sizeof(Kinds[0])) return errorCodeToError( std::make_error_code(std::errc::executable_format_error)); Entry.Kind = Kinds[Kind]; |