averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22899 from drodriguez/reflection-context-fix-2

Browse Source 
Reflection: try holding 32/64 address offset in target machine pointers.
This commit is contained in:
Daniel Rodríguez Troitiño
2019-02-27 11:34:36 -08:00
committed by GitHub
parent e73127265e 8bee95d232
commit 3f76e63b6e
4 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/swift/Reflection/ReflectionContext.h
View File

@@ -62,7 +62,6 @@ template <> struct ELFTraits<llvm::ELF::ELFCLASS32> {
using Section = const struct llvm::ELF::Elf32_Shdr;
using Offset = llvm::ELF::Elf32_Off;
using Size = llvm::ELF::Elf32_Word;
using Address = llvm::ELF::Elf32_Addr;
static constexpr unsigned char ELFClass = llvm::ELF::ELFCLASS32;
};
@@ -71,7 +70,6 @@ template <> struct ELFTraits<llvm::ELF::ELFCLASS64> {
using Section = const struct llvm::ELF::Elf64_Shdr;
using Offset = llvm::ELF::Elf64_Off;
using Size = llvm::ELF::Elf64_Xword;
using Address = llvm::ELF::Elf64_Addr;
static constexpr unsigned char ELFClass = llvm::ELF::ELFCLASS64;
};
@@ -204,7 +202,7 @@ public:
RangeEnd - RangeStart);
auto findMachOSectionByName = [&](std::string Name)
-> std::pair<std::pair<const char *, const char *>, uint32_t> {
-> std::pair<std::pair<const char *, const char *>, uint64_t> {
for (unsigned I = 0; I < NumSect; ++I) {
auto S = reinterpret_cast<typename T::Section *>(
SectionsBuf + (I * sizeof(typename T::Section)));
@@ -235,8 +233,8 @@ public:
ReflStrMdSec.first.first == nullptr)
return false;
auto LocalStartAddress = reinterpret_cast<uintptr_t>(SectBuf.get());
auto RemoteStartAddress = static_cast<uintptr_t>(RangeStart);
auto LocalStartAddress = reinterpret_cast<uint64_t>(SectBuf.get());
auto RemoteStartAddress = static_cast<uint64_t>(RangeStart);
ReflectionInfo info = {
{{FieldMdSec.first.first, FieldMdSec.first.second}, 0},
@@ -428,7 +426,7 @@ public:
auto StrTab = reinterpret_cast<const char *>(StrTabBuf.get());
auto findELFSectionByName = [&](std::string Name)
-> std::pair<std::pair<const char *, const char *>, typename T::Address> {
-> std::pair<std::pair<const char *, const char *>, uint64_t> {
// Now for all the sections, find their name.
for (const typename T::Section *Hdr : SecHdrVec) {
uint32_t Offset = Hdr->sh_name;
@@ -463,9 +461,9 @@ public:
ReflStrMdSec.first.first == nullptr)
return false;
auto LocalStartAddress = reinterpret_cast<uintptr_t>(Buf.get());
auto LocalStartAddress = reinterpret_cast<uint64_t>(Buf.get());
auto RemoteStartAddress =
static_cast<uintptr_t>(ImageStart.getAddressData());
static_cast<uint64_t>(ImageStart.getAddressData());
ReflectionInfo info = {
{{FieldMdSec.first.first, FieldMdSec.first.second}, FieldMdSec.second},