return getHeader().filetype == MachO::MH_OBJECT;
}
-ErrorOr<std::unique_ptr<MachOObjectFile>>
+Expected<std::unique_ptr<MachOObjectFile>>
ObjectFile::createMachOObjectFile(MemoryBufferRef Buffer) {
StringRef Magic = Buffer.getBuffer().slice(0, 4);
if (Magic == "\xFE\xED\xFA\xCE")
- return expectedToErrorOr(
- MachOObjectFile::create(Buffer, false, false));
+ return MachOObjectFile::create(Buffer, false, false);
else if (Magic == "\xCE\xFA\xED\xFE")
- return expectedToErrorOr(
- MachOObjectFile::create(Buffer, true, false));
+ return MachOObjectFile::create(Buffer, true, false);
else if (Magic == "\xFE\xED\xFA\xCF")
- return expectedToErrorOr(
- MachOObjectFile::create(Buffer, false, true));
+ return MachOObjectFile::create(Buffer, false, true);
else if (Magic == "\xCF\xFA\xED\xFE")
- return expectedToErrorOr(
- MachOObjectFile::create(Buffer, true, true));
+ return MachOObjectFile::create(Buffer, true, true);
//else
- return object_error::parse_failed;
+ return malformedError(Buffer.getBufferIdentifier(),
+ "Unrecognized MachO magic number");
}
StringRef ObjectData = ParentData.substr(Header.offset, Header.size);
StringRef ObjectName = Parent->getFileName();
MemoryBufferRef ObjBuffer(ObjectData, ObjectName);
- return ObjectFile::createMachOObjectFile(ObjBuffer);
+ return expectedToErrorOr(ObjectFile::createMachOObjectFile(ObjBuffer));
}
ErrorOr<std::unique_ptr<Archive>>
case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub:
case sys::fs::file_magic::macho_dsym_companion:
case sys::fs::file_magic::macho_kext_bundle:
- return createMachOObjectFile(Object);
+ return expectedToErrorOr(createMachOObjectFile(Object));
case sys::fs::file_magic::coff_object:
case sys::fs::file_magic::coff_import_library:
case sys::fs::file_magic::pecoff_executable: