LLVM 3.5 merge: Subzero

src/IceCfg.h

 //===- subzero/src/IceCfg.h - Control flow graph ----------------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares the Cfg class, which represents the control flow
 // graph and the overall per-function compilation context.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICECFG_H
 #define SUBZERO_SRC_ICECFG_H
 
 #include "IceDefs.h"
 #include "IceTypes.h"
 
 #include "assembler.h"
 #include "IceClFlags.h"
 #include "IceGlobalContext.h"
 
-#include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/Allocator.h"
 
+#include <memory>
+
 namespace Ice {
 
 class Cfg {
 public:
   Cfg(GlobalContext *Ctx);
   ~Cfg();
 
   GlobalContext *getContext() const { return Ctx; }
 
   // Manage the name and return type of the function being translated.
@@ skipping 127 matching lines @@
   Type ReturnType;
   bool IsInternalLinkage;
   bool HasError;
   IceString ErrorMessage;
   CfgNode *Entry; // entry basic block
   NodeList Nodes; // linearized node list; Entry should be first
   InstNumberT NextInstNumber;
   VarList Variables;
   VarList Args; // subset of Variables, in argument order
   VarList ImplicitArgs; // subset of Variables
-  llvm::OwningPtr<Liveness> Live;
-  llvm::OwningPtr<TargetLowering> Target;
-  llvm::OwningPtr<VariablesMetadata> VMetadata;
-  llvm::OwningPtr<Assembler> TargetAssembler;
+  std::unique_ptr<Liveness> Live;
+  std::unique_ptr<TargetLowering> Target;
+  std::unique_ptr<VariablesMetadata> VMetadata;
+  std::unique_ptr<Assembler> TargetAssembler;
 
   // CurrentNode is maintained during dumping/emitting just for
   // validating Variable::DefNode.  Normally, a traversal over
   // CfgNodes maintains this, but before global operations like
   // register allocation, resetCurrentNode() should be called to avoid
   // spurious validation failures.
   const CfgNode *CurrentNode;
 
   Cfg(const Cfg &) LLVM_DELETED_FUNCTION;
   Cfg &operator=(const Cfg &) LLVM_DELETED_FUNCTION;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECFG_H