From a9ecddbbe5dbb1f463065b38e37fbc0d3022bcc8 Mon Sep 17 00:00:00 2001 From: Pete Cooper Date: Tue, 9 Jun 2015 19:56:05 +0000 Subject: Make MCSymbol::Name be a union of uint64_t and a pointer. 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 llvm-svn: 239428 --- llvm/lib/MC/MCSymbol.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'llvm/lib/MC') diff --git a/llvm/lib/MC/MCSymbol.cpp b/llvm/lib/MC/MCSymbol.cpp index e82630640ba..a5097bc90f6 100644 --- a/llvm/lib/MC/MCSymbol.cpp +++ b/llvm/lib/MC/MCSymbol.cpp @@ -19,17 +19,20 @@ using namespace llvm; // Sentinel value for the absolute pseudo section. MCSection *MCSymbol::AbsolutePseudoSection = reinterpret_cast(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 *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() <= alignOf() && + assert(alignOf() <= alignOf() && "Bad alignment of MCSymbol"); - void *Storage = Ctx.allocate(Size, alignOf()); - NameEntryTy **Start = static_cast(Storage); - NameEntryTy **End = Start + (Name ? 1 : 0); + void *Storage = Ctx.allocate(Size, alignOf()); + NameEntryStorageTy *Start = static_cast(Storage); + NameEntryStorageTy *End = Start + (Name ? 1 : 0); return End; } -- cgit v1.2.3