Changes from 3.7 merge to files not in upstream

lib/Target/X86/MCTargetDesc/X86MCNaCl.cpp

 //=== X86MCNaCl.cpp - Expansion of NaCl pseudo-instructions      --*- C++ -*-=//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 //===----------------------------------------------------------------------===//
@@ skipping 30 matching lines @@
                                   cl::init(true));
 
 const int kNaClX86InstructionBundleSize = 32;
 
 // See the notes below where these functions are defined.
 namespace {
 unsigned getX86SubSuperRegister_(unsigned Reg, EVT VT, bool High=false);
 unsigned DemoteRegTo32_(unsigned RegIn);
 } // namespace
 
-static MCSymbol *CreateTempLabel(MCContext &Context, const char *Prefix) {
-  SmallString<128> NameSV;
-  raw_svector_ostream(NameSV)
-    << Context.getAsmInfo()->getPrivateGlobalPrefix() // get internal label
-    << Prefix << Context.getUniqueSymbolID();
-  return Context.GetOrCreateSymbol(NameSV);
-}
-
 static void PushReturnAddress(const llvm::MCSubtargetInfo &STI,
                               MCContext &Context, MCStreamer &Out,
                               MCSymbol *RetTarget) {
   const MCExpr *RetTargetExpr = MCSymbolRefExpr::Create(RetTarget, Context);
   if (Context.getObjectFileInfo()->getRelocM() == Reloc::PIC_) {
     // Calculate return_addr
     // The return address should not be calculated into R11 because if the push
     // instruction ends up at the start of a bundle, an attacker could arrange
     // an indirect jump to it, which would push the full jump target
     // (which itself was calculated into r11) onto the stack.
@@ skipping 39 matching lines @@
     // When generating PIC code, calculate the return address manually:
     //  leal return_addr(%rip), %r10d
     //  push %r10
     //  jmp target
     //  .align 32
     //  return_addr:
 
     MCContext &Context = Out.getContext();
 
     // Generate a label for the return address.
-    MCSymbol *RetTarget = CreateTempLabel(Context, "DirectCallRetAddr");
+    MCSymbol *RetTarget = Context.createTempSymbol("DirectCallRetAddr", true);
 
     PushReturnAddress(STI, Context, Out, RetTarget);
 
     // jmp target
     MCInst JMPInst;
     JMPInst.setOpcode(X86::JMP_4);
     JMPInst.addOperand(Op);
     Out.EmitInstruction(JMPInst, STI);
 
     Out.EmitCodeAlignment(kNaClX86InstructionBundleSize);
@@ skipping 69 matching lines @@
       MCInst MOVInst;
       MOVInst.setOpcode(X86::MOV32rr);
       MOVInst.addOperand(MCOperand::CreateReg(SafeReg32));
       MOVInst.addOperand(MCOperand::CreateReg(Reg32));
       Out.EmitInstruction(MOVInst, STI);
       Reg32 = SafeReg32;
     }
     if (IsCall) {
       MCContext &Context = Out.getContext();
       // Generate a label for the return address.
-      RetTarget = CreateTempLabel(Context, "IndirectCallRetAddr");
+      RetTarget = Context.createTempSymbol("IndirectCallRetAddr", true);
       // Explicitly push the (32-bit) return address for a NaCl64 call
       // instruction.
       PushReturnAddress(STI, Context, Out, RetTarget);
     }
   }
   const unsigned Reg64 = getX86SubSuperRegister_(Reg32, MVT::i64);
 
   const bool WillEmitCallInst = IsCall && !HideSandboxBase;
   Out.EmitBundleLock(WillEmitCallInst);
 
@@ skipping 614 matching lines @@
 
 unsigned DemoteRegTo32_(unsigned RegIn) {
   if (RegIn == 0)
     return 0;
   unsigned RegOut = getX86SubSuperRegister_(RegIn, MVT::i32, false);
   assert(RegOut != 0);
   return RegOut;
 }
 } //namespace
 // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@