LLVM 3.5 merge: Subzero

src/IceCfg.h

Index: src/IceCfg.h
diff --git a/src/IceCfg.h b/src/IceCfg.h
index 1de77956951b741e19b4e68803327307257960a2..74b60992e9f75b640ac6239a771c71d680dfc40e 100644
--- a/src/IceCfg.h
+++ b/src/IceCfg.h
@@ -22,9 +22,10 @@
 #include "IceClFlags.h"
 #include "IceGlobalContext.h"
 
-#include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/Allocator.h"
 
+#include <memory>
+
 namespace Ice {
 
 class Cfg {
@@ -172,10 +173,10 @@ private:
   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