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

Make MCSymbol::Name be a union of uint64_t and a pointer.

Browse Source 
This should hopefully fix the 32-bit bots which were allocating space for a pointer
but needed to be aligned to 64-bits.

Now we allocate enough space for a uint64_t and a pointer and cast to the appropriate storage

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239428 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Pete Cooper
2015-06-09 19:56:05 +00:00
parent 0e3246a86f
commit 5c8a22f11b
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/MC/MCSymbol.cpp
View File

@@ -19,17 +19,20 @@ using namespace llvm;
// Sentinel value for the absolute pseudo section.
MCSection *MCSymbol::AbsolutePseudoSection = reinterpret_cast<MCSection *>(1);
void *MCSymbol::operator new(size_t s, NameEntryTy *Name, MCContext &Ctx) {
size_t Size = s + (Name ? sizeof(Name) : 0);
void *MCSymbol::operator new(size_t s, const StringMapEntry<bool> *Name,
MCContext &Ctx) {
// We may need more space for a Name to account for alignment. So allocate
// space for the storage type and not the name pointer.
size_t Size = s + (Name ? sizeof(NameEntryStorageTy) : 0);
// For safety, ensure that the alignment of a pointer is enough for an
// MCSymbol. This also ensures we don't need padding between the name and
// symbol.
assert(alignOf<MCSymbol>() <= alignOf<NameEntryTy *>() &&
assert(alignOf<MCSymbol>() <= alignOf<NameEntryStorageTy>() &&
"Bad alignment of MCSymbol");
void *Storage = Ctx.allocate(Size, alignOf<NameEntryTy *>());
NameEntryTy **Start = static_cast<NameEntryTy**>(Storage);
NameEntryTy **End = Start + (Name ? 1 : 0);
void *Storage = Ctx.allocate(Size, alignOf<NameEntryStorageTy>());
NameEntryStorageTy *Start = static_cast<NameEntryStorageTy*>(Storage);
NameEntryStorageTy *End = Start + (Name ? 1 : 0);
return End;
}