aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm-project/llvm/lib/Object/MachOObjectFile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/llvm-project/llvm/lib/Object/MachOObjectFile.cpp')
-rw-r--r--contrib/llvm-project/llvm/lib/Object/MachOObjectFile.cpp82
1 files changed, 50 insertions, 32 deletions
diff --git a/contrib/llvm-project/llvm/lib/Object/MachOObjectFile.cpp b/contrib/llvm-project/llvm/lib/Object/MachOObjectFile.cpp
index 6ca83a955d5a..1cfd0a069463 100644
--- a/contrib/llvm-project/llvm/lib/Object/MachOObjectFile.cpp
+++ b/contrib/llvm-project/llvm/lib/Object/MachOObjectFile.cpp
@@ -108,9 +108,11 @@ getSectionPtr(const MachOObjectFile &O, MachOObjectFile::LoadCommandInfo L,
return reinterpret_cast<const char*>(SectionAddr);
}
-static const char *getPtr(const MachOObjectFile &O, size_t Offset) {
- assert(Offset <= O.getData().size());
- return O.getData().data() + Offset;
+static const char *getPtr(const MachOObjectFile &O, size_t Offset,
+ size_t MachOFilesetEntryOffset = 0) {
+ assert(Offset <= O.getData().size() &&
+ MachOFilesetEntryOffset <= O.getData().size());
+ return O.getData().data() + Offset + MachOFilesetEntryOffset;
}
static MachO::nlist_base
@@ -208,7 +210,8 @@ getFirstLoadCommandInfo(const MachOObjectFile &Obj) {
if (sizeof(MachO::load_command) > Obj.getHeader().sizeofcmds)
return malformedError("load command 0 extends past the end all load "
"commands in the file");
- return getLoadCommandInfo(Obj, getPtr(Obj, HeaderSize), 0);
+ return getLoadCommandInfo(
+ Obj, getPtr(Obj, HeaderSize, Obj.getMachOFilesetEntryOffset()), 0);
}
static Expected<MachOObjectFile::LoadCommandInfo>
@@ -217,7 +220,8 @@ getNextLoadCommandInfo(const MachOObjectFile &Obj, uint32_t LoadCommandIndex,
unsigned HeaderSize = Obj.is64Bit() ? sizeof(MachO::mach_header_64)
: sizeof(MachO::mach_header);
if (L.Ptr + L.C.cmdsize + sizeof(MachO::load_command) >
- Obj.getData().data() + HeaderSize + Obj.getHeader().sizeofcmds)
+ Obj.getData().data() + Obj.getMachOFilesetEntryOffset() + HeaderSize +
+ Obj.getHeader().sizeofcmds)
return malformedError("load command " + Twine(LoadCommandIndex + 1) +
" extends past the end all load commands in the file");
return getLoadCommandInfo(Obj, L.Ptr + L.C.cmdsize, LoadCommandIndex + 1);
@@ -231,7 +235,8 @@ static void parseHeader(const MachOObjectFile &Obj, T &Header,
"file");
return;
}
- if (auto HeaderOrErr = getStructOrErr<T>(Obj, getPtr(Obj, 0)))
+ if (auto HeaderOrErr = getStructOrErr<T>(
+ Obj, getPtr(Obj, 0, Obj.getMachOFilesetEntryOffset())))
Header = *HeaderOrErr;
else
Err = HeaderOrErr.takeError();
@@ -1247,12 +1252,12 @@ static bool isLoadCommandObsolete(uint32_t cmd) {
Expected<std::unique_ptr<MachOObjectFile>>
MachOObjectFile::create(MemoryBufferRef Object, bool IsLittleEndian,
bool Is64Bits, uint32_t UniversalCputype,
- uint32_t UniversalIndex) {
+ uint32_t UniversalIndex,
+ size_t MachOFilesetEntryOffset) {
Error Err = Error::success();
- std::unique_ptr<MachOObjectFile> Obj(
- new MachOObjectFile(std::move(Object), IsLittleEndian,
- Is64Bits, Err, UniversalCputype,
- UniversalIndex));
+ std::unique_ptr<MachOObjectFile> Obj(new MachOObjectFile(
+ std::move(Object), IsLittleEndian, Is64Bits, Err, UniversalCputype,
+ UniversalIndex, MachOFilesetEntryOffset));
if (Err)
return std::move(Err);
return std::move(Obj);
@@ -1261,8 +1266,10 @@ MachOObjectFile::create(MemoryBufferRef Object, bool IsLittleEndian,
MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian,
bool Is64bits, Error &Err,
uint32_t UniversalCputype,
- uint32_t UniversalIndex)
- : ObjectFile(getMachOType(IsLittleEndian, Is64bits), Object) {
+ uint32_t UniversalIndex,
+ size_t MachOFilesetEntryOffset)
+ : ObjectFile(getMachOType(IsLittleEndian, Is64bits), Object),
+ MachOFilesetEntryOffset(MachOFilesetEntryOffset) {
ErrorAsOutParameter ErrAsOutParam(&Err);
uint64_t SizeOfHeaders;
uint32_t cputype;
@@ -2059,9 +2066,9 @@ bool MachOObjectFile::isDebugSection(DataRefImpl Sec) const {
return false;
}
StringRef SectionName = SectionNameOrErr.get();
- return SectionName.startswith("__debug") ||
- SectionName.startswith("__zdebug") ||
- SectionName.startswith("__apple") || SectionName == "__gdb_index" ||
+ return SectionName.starts_with("__debug") ||
+ SectionName.starts_with("__zdebug") ||
+ SectionName.starts_with("__apple") || SectionName == "__gdb_index" ||
SectionName == "__swift_ast";
}
@@ -2076,7 +2083,7 @@ ArrayRef<uint8_t> getSegmentContents(const MachOObjectFile &Obj,
return {};
}
auto &Segment = SegmentOrErr.get();
- if (StringRef(Segment.segname, 16).startswith(SegmentName))
+ if (StringRef(Segment.segname, 16).starts_with(SegmentName))
return arrayRefFromStringRef(Obj.getData().slice(
Segment.fileoff, Segment.fileoff + Segment.filesize));
return {};
@@ -2462,7 +2469,7 @@ StringRef MachOObjectFile::guessLibraryShortName(StringRef Name,
if (c == Name.npos || c == 0)
goto guess_library;
V = Name.slice(c+1, Name.npos);
- if (!V.startswith("Versions/"))
+ if (!V.starts_with("Versions/"))
goto guess_library;
d = Name.rfind('/', c);
if (d == Name.npos)
@@ -2989,7 +2996,7 @@ void ExportEntry::pushNode(uint64_t offset) {
ErrorAsOutParameter ErrAsOutParam(E);
const uint8_t *Ptr = Trie.begin() + offset;
NodeState State(Ptr);
- const char *error;
+ const char *error = nullptr;
uint64_t ExportInfoSize = readULEB128(State.Current, &error);
if (error) {
*E = malformedError("export info size " + Twine(error) +
@@ -3124,7 +3131,7 @@ void ExportEntry::pushNode(uint64_t offset) {
void ExportEntry::pushDownUntilBottom() {
ErrorAsOutParameter ErrAsOutParam(E);
- const char *error;
+ const char *error = nullptr;
while (Stack.back().NextChildIndex < Stack.back().ChildCount) {
NodeState &Top = Stack.back();
CumulativeString.resize(Top.ParentStringLength);
@@ -4761,6 +4768,11 @@ MachOObjectFile::getThreadCommand(const LoadCommandInfo &L) const {
return getStruct<MachO::thread_command>(*this, L.Ptr);
}
+MachO::fileset_entry_command
+MachOObjectFile::getFilesetEntryLoadCommand(const LoadCommandInfo &L) const {
+ return getStruct<MachO::fileset_entry_command>(*this, L.Ptr);
+}
+
MachO::any_relocation_info
MachOObjectFile::getRelocation(DataRefImpl Rel) const {
uint32_t Offset;
@@ -5300,23 +5312,29 @@ bool MachOObjectFile::isRelocatableObject() const {
return getHeader().filetype == MachO::MH_OBJECT;
}
-Expected<std::unique_ptr<MachOObjectFile>>
-ObjectFile::createMachOObjectFile(MemoryBufferRef Buffer,
- uint32_t UniversalCputype,
- uint32_t UniversalIndex) {
+/// Create a MachOObjectFile instance from a given buffer.
+///
+/// \param Buffer Memory buffer containing the MachO binary data.
+/// \param UniversalCputype CPU type when the MachO part of a universal binary.
+/// \param UniversalIndex Index of the MachO within a universal binary.
+/// \param MachOFilesetEntryOffset Offset of the MachO entry in a fileset MachO.
+/// \returns A std::unique_ptr to a MachOObjectFile instance on success.
+Expected<std::unique_ptr<MachOObjectFile>> ObjectFile::createMachOObjectFile(
+ MemoryBufferRef Buffer, uint32_t UniversalCputype, uint32_t UniversalIndex,
+ size_t MachOFilesetEntryOffset) {
StringRef Magic = Buffer.getBuffer().slice(0, 4);
if (Magic == "\xFE\xED\xFA\xCE")
- return MachOObjectFile::create(Buffer, false, false,
- UniversalCputype, UniversalIndex);
+ return MachOObjectFile::create(Buffer, false, false, UniversalCputype,
+ UniversalIndex, MachOFilesetEntryOffset);
if (Magic == "\xCE\xFA\xED\xFE")
- return MachOObjectFile::create(Buffer, true, false,
- UniversalCputype, UniversalIndex);
+ return MachOObjectFile::create(Buffer, true, false, UniversalCputype,
+ UniversalIndex, MachOFilesetEntryOffset);
if (Magic == "\xFE\xED\xFA\xCF")
- return MachOObjectFile::create(Buffer, false, true,
- UniversalCputype, UniversalIndex);
+ return MachOObjectFile::create(Buffer, false, true, UniversalCputype,
+ UniversalIndex, MachOFilesetEntryOffset);
if (Magic == "\xCF\xFA\xED\xFE")
- return MachOObjectFile::create(Buffer, true, true,
- UniversalCputype, UniversalIndex);
+ return MachOObjectFile::create(Buffer, true, true, UniversalCputype,
+ UniversalIndex, MachOFilesetEntryOffset);
return make_error<GenericBinaryError>("Unrecognized MachO magic number",
object_error::invalid_file_type);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-17 16:08:54 +0000