diff options
Diffstat (limited to 'llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp index ae2d47fb8c5e..95cf89ec3f8b 100644 --- a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp +++ b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp @@ -62,7 +62,7 @@ CtorDtorIterator::Element CtorDtorIterator::operator*() const { break; } else if (ConstantExpr *CE = dyn_cast_or_null<ConstantExpr>(FuncC)) { if (CE->isCast()) - FuncC = dyn_cast_or_null<ConstantExpr>(CE->getOperand(0)); + FuncC = CE->getOperand(0); else break; } else { @@ -273,10 +273,10 @@ Expected<std::unique_ptr<StaticLibraryDefinitionGenerator>> StaticLibraryDefinitionGenerator::Load( ObjectLayer &L, const char *FileName, GetObjectFileInterface GetObjFileInterface) { - auto ArchiveBuffer = errorOrToExpected(MemoryBuffer::getFile(FileName)); + auto ArchiveBuffer = MemoryBuffer::getFile(FileName); if (!ArchiveBuffer) - return ArchiveBuffer.takeError(); + return createFileError(FileName, ArchiveBuffer.getError()); return Create(L, std::move(*ArchiveBuffer), std::move(GetObjFileInterface)); } @@ -288,7 +288,7 @@ StaticLibraryDefinitionGenerator::Load( auto B = object::createBinary(FileName); if (!B) - return B.takeError(); + return createFileError(FileName, B.takeError()); // If this is a regular archive then create an instance from it. if (isa<object::Archive>(B->getBinary())) |