6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

Convert a few methods to use ErrorOr.

Browse Source 
It used to be inconvenient to mix ErrorOr and UniquePtr, but with c++11
they work OK together.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211532 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-06-23 20:41:02 +00:00
parent 0da818cdbb
commit 2da970364f
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Object/MachOUniversal.cpp
View File

@@ -67,19 +67,15 @@ MachOUniversalBinary::ObjectForArch::ObjectForArch(
}
}
std::error_code MachOUniversalBinary::ObjectForArch::getAsObjectFile(
std::unique_ptr<ObjectFile> &Result) const {
ErrorOr<std::unique_ptr<ObjectFile>>
MachOUniversalBinary::ObjectForArch::getAsObjectFile() const {
if (Parent) {
StringRef ParentData = Parent->getData();
StringRef ObjectData = ParentData.substr(Header.offset, Header.size);
std::string ObjectName = Parent->getFileName().str();
MemoryBuffer *ObjBuffer = MemoryBuffer::getMemBuffer(
ObjectData, ObjectName, false);
ErrorOr<ObjectFile *> Obj = ObjectFile::createMachOObjectFile(ObjBuffer);
if (std::error_code EC = Obj.getError())
return EC;
Result.reset(Obj.get());
return object_error::success;
return ObjectFile::createMachOObjectFile(ObjBuffer);
}
return object_error::parse_failed;
}
@@ -145,14 +141,14 @@ static bool getCTMForArch(Triple::ArchType Arch, MachO::CPUType &CTM) {
}
}
std::error_code MachOUniversalBinary::getObjectForArch(
Triple::ArchType Arch, std::unique_ptr<ObjectFile> &Result) const {
ErrorOr<std::unique_ptr<ObjectFile>>
MachOUniversalBinary::getObjectForArch(Triple::ArchType Arch) const {
MachO::CPUType CTM;
if (!getCTMForArch(Arch, CTM))
return object_error::arch_not_found;
for (object_iterator I = begin_objects(), E = end_objects(); I != E; ++I) {
if (I->getCPUType() == static_cast<uint32_t>(CTM))
return I->getAsObjectFile(Result);
return I->getAsObjectFile();
}
return object_error::arch_not_found;
}