LLVM 3.5 merge: Subzero

src/IceTranslator.cpp

 //===- subzero/src/IceTranslator.cpp - ICE to machine code ------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the general driver class for translating ICE to
@@ skipping 90 matching lines @@
     Ctx->dumpStats(Func->getFunctionName());
   }
 }
 
 void Translator::emitConstants() {
   if (!Ctx->getFlags().DisableTranslation && Func)
     Func->getTarget()->emitConstants();
 }
 
 void Translator::convertGlobals(llvm::Module *Mod) {
-  llvm::OwningPtr<TargetGlobalInitLowering> GlobalLowering(
+  std::unique_ptr<TargetGlobalInitLowering> GlobalLowering(
       TargetGlobalInitLowering::createLowering(Ctx->getTargetArch(), Ctx));
   for (llvm::Module::const_global_iterator I = Mod->global_begin(),
                                            E = Mod->global_end();
        I != E; ++I) {
     if (!I->hasInitializer())
       continue;
     const llvm::Constant *Initializer = I->getInitializer();
     IceString Name = I->getName();
     unsigned Align = I->getAlignment();
     uint64_t NumElements = 0;
@@ skipping 23 matching lines @@
     } else {
       llvm_unreachable("Unhandled global initializer");
     }
 
     GlobalLowering->lower(Name, Align, IsInternal, IsConst, IsZeroInitializer,
                           NumElements, Data,
                           Ctx->getFlags().DisableTranslation);
   }
   GlobalLowering.reset();
 }