RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-04 03:17:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Object] Change Archive::findSym to return an Expected<Optional<Child>>.

Browse Source 
As suggested by Rafael in review of D22079 - this was accidentally left out of
the final commit (r275316).



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@275469 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2016-07-14 20:44:27 +00:00
parent f3702b696c
commit 36105c0dde
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/Object/Archive.h
View File

@ -14,6 +14,7 @@
#ifndef LLVM_OBJECT_ARCHIVE_H
#define LLVM_OBJECT_ARCHIVE_H
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/iterator_range.h"
#include "llvm/Object/Binary.h"
@ -215,7 +216,7 @@ public:
}
// check if a symbol is in the archive
child_iterator findSym(Error &Err, StringRef name) const;
Expected<Optional<Child>> findSym(StringRef name) const;
bool hasSymbolTable() const;
StringRef getSymbolTable() const { return SymbolTable; }

12
lib/ExecutionEngine/MCJIT/MCJIT.cpp
View File

@ -327,14 +327,14 @@ RuntimeDyld::SymbolInfo MCJIT::findSymbol(const std::string &Name,
for (object::OwningBinary<object::Archive> &OB : Archives) {
object::Archive *A = OB.getBinary();
// Look for our symbols in each Archive
Error Err;
object::Archive::child_iterator ChildIt = A->findSym(Err, Name);
if (Err)
report_fatal_error(std::move(Err));
if (ChildIt != A->child_end()) {
auto OptionalChildOrErr = A->findSym(Name);
if (!OptionalChildOrErr)
report_fatal_error(OptionalChildOrErr.takeError());
auto &OptionalChild = *OptionalChildOrErr;
if (OptionalChild) {
// FIXME: Support nested archives?
Expected<std::unique_ptr<object::Binary>> ChildBinOrErr =
ChildIt->getAsBinary();
OptionalChild->getAsBinary();
if (!ChildBinOrErr) {
// TODO: Actually report errors helpfully.
consumeError(ChildBinOrErr.takeError());

12
lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
View File

@ -258,14 +258,14 @@ private:
for (object::OwningBinary<object::Archive> &OB : Archives) {
object::Archive *A = OB.getBinary();
// Look for our symbols in each Archive
Error Err;
object::Archive::child_iterator ChildIt = A->findSym(Err, Name);
if (Err)
report_fatal_error(std::move(Err));
if (ChildIt != A->child_end()) {
auto OptionalChildOrErr = A->findSym(Name);
if (!OptionalChildOrErr)
report_fatal_error(OptionalChildOrErr.takeError());
auto &OptionalChild = *OptionalChildOrErr;
if (OptionalChild) {
// FIXME: Support nested archives?
Expected<std::unique_ptr<object::Binary>> ChildBinOrErr =
ChildIt->getAsBinary();
OptionalChild->getAsBinary();
if (!ChildBinOrErr) {
// TODO: Actually report errors helpfully.
consumeError(ChildBinOrErr.takeError());

15
lib/Object/Archive.cpp
View File

@ -667,23 +667,20 @@ uint32_t Archive::getNumberOfSymbols() const {
return read32le(buf);
}
Archive::child_iterator Archive::findSym(Error &Err, StringRef name) const {
Expected<Optional<Archive::Child>> Archive::findSym(StringRef name) const {
Archive::symbol_iterator bs = symbol_begin();
Archive::symbol_iterator es = symbol_end();
for (; bs != es; ++bs) {
StringRef SymName = bs->getName();
if (SymName == name) {
if (auto MemberOrErr = bs->getMember()) {
return child_iterator(*MemberOrErr, &Err);
} else {
ErrorAsOutParameter ErrAsOutParam(Err);
Err = errorCodeToError(MemberOrErr.getError());
return child_end();
}
if (auto MemberOrErr = bs->getMember())
return Child(*MemberOrErr);
else
return errorCodeToError(MemberOrErr.getError());
}
}
return child_end();
return Optional<Child>();
}
bool Archive::hasSymbolTable() const { return !SymbolTable.empty(); }