-Wdeprecated-clean: Fix cases of violating the rule of 5 in ways that are deprecated...

[oota-llvm.git] / lib / MC / MCSymbol.cpp

diff --git a/lib/MC/MCSymbol.cpp b/lib/MC/MCSymbol.cpp
index 7eba5e0317c6285bb9b77492742267f35c7e297e..125380a9d14066aea4508f4a35d8f37b9366512e 100644 (file)
--- a/lib/MC/MCSymbol.cpp
+++ b/lib/MC/MCSymbol.cpp
@@ -19,25 +19,33 @@ 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 *) &&
-         "Bad alignment of MCSymbol");
-  void *Storage = Ctx.allocate(Size, alignof(NameEntryTy *));
-  NameEntryTy **Start = static_cast<NameEntryTy**>(Storage);
-  NameEntryTy **End = Start + (Name ? 1 : 0);
+  static_assert((unsigned)AlignOf<MCSymbol>::Alignment <=
+                AlignOf<NameEntryStorageTy>::Alignment,
+                "Bad alignment of MCSymbol");
+  void *Storage = Ctx.allocate(Size, alignOf<NameEntryStorageTy>());
+  NameEntryStorageTy *Start = static_cast<NameEntryStorageTy*>(Storage);
+  NameEntryStorageTy *End = Start + (Name ? 1 : 0);
   return End;
 }
 
 void MCSymbol::setVariableValue(const MCExpr *Value) {
   assert(!IsUsed && "Cannot set a variable that has already been used.");
   assert(Value && "Invalid variable value!");
+  assert((SymbolContents == SymContentsUnset ||
+          SymbolContents == SymContentsVariable) &&
+         "Cannot give common/offset symbol a variable value");
   this->Value = Value;
-  SectionOrFragment = nullptr;
+  SymbolContents = SymContentsVariable;
+  setUndefined();
 }
 
 void MCSymbol::print(raw_ostream &OS, const MCAsmInfo *MAI) const {