commit 56440fd8203f581b9aded68db3631ea11a72ccf2
author Ahmed Charles <ahmedcharles@gmail.com> Thu Mar 06 05:51:42 2014 +0000
committer Ahmed Charles <ahmedcharles@gmail.com> Thu Mar 06 05:51:42 2014 +0000
tree 7f80c03b91a2d762573379b2624e3f1de93e6ab6
parent 47c254beb732a4434f814c4415cbc60503dd331a

Replace OwningPtr<T> with std::unique_ptr<T>.

This compiles with no changes to clang/lld/lldb with MSVC and includes
overloads to various functions which are used by those projects and llvm
which have OwningPtr's as parameters. This should allow out of tree
projects some time to move. There are also no changes to libs/Target,
which should help out of tree targets have time to move, if necessary.

llvm-svn: 203083

llvm/lib/DebugInfo/DWARFContext.cpp

diff --git a/llvm/lib/DebugInfo/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARFContext.cpp
index 5cce8df..37e86bd 100644
--- a/llvm/lib/DebugInfo/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARFContext.cpp
@@ -301,7 +301,7 @@
   const DataExtractor &DIData = DataExtractor(getInfoSection().Data,
                                               isLittleEndian(), 0);
   while (DIData.isValidOffset(offset)) {
-    OwningPtr<DWARFCompileUnit> CU(new DWARFCompileUnit(
+    std::unique_ptr<DWARFCompileUnit> CU(new DWARFCompileUnit(
         getDebugAbbrev(), getInfoSection().Data, getAbbrevSection(),
         getRangeSection(), getStringSection(), StringRef(), getAddrSection(),
         &getInfoSection().Relocs, isLittleEndian()));
@@ -321,7 +321,7 @@
     const DataExtractor &DIData =
         DataExtractor(I->second.Data, isLittleEndian(), 0);
     while (DIData.isValidOffset(offset)) {
-      OwningPtr<DWARFTypeUnit> TU(new DWARFTypeUnit(
+      std::unique_ptr<DWARFTypeUnit> TU(new DWARFTypeUnit(
           getDebugAbbrev(), I->second.Data, getAbbrevSection(),
           getRangeSection(), getStringSection(), StringRef(), getAddrSection(),
           &I->second.Relocs, isLittleEndian()));
@@ -338,7 +338,7 @@
   const DataExtractor &DIData =
       DataExtractor(getInfoDWOSection().Data, isLittleEndian(), 0);
   while (DIData.isValidOffset(offset)) {
-    OwningPtr<DWARFCompileUnit> DWOCU(new DWARFCompileUnit(
+    std::unique_ptr<DWARFCompileUnit> DWOCU(new DWARFCompileUnit(
         getDebugAbbrevDWO(), getInfoDWOSection().Data, getAbbrevDWOSection(),
         getRangeDWOSection(), getStringDWOSection(),
         getStringOffsetDWOSection(), getAddrSection(),
@@ -359,7 +359,7 @@
     const DataExtractor &DIData =
         DataExtractor(I->second.Data, isLittleEndian(), 0);
     while (DIData.isValidOffset(offset)) {
-      OwningPtr<DWARFTypeUnit> TU(new DWARFTypeUnit(
+      std::unique_ptr<DWARFTypeUnit> TU(new DWARFTypeUnit(
           getDebugAbbrevDWO(), I->second.Data, getAbbrevDWOSection(),
           getRangeDWOSection(), getStringDWOSection(),
           getStringOffsetDWOSection(), getAddrSection(), &I->second.Relocs,
@@ -629,7 +629,7 @@
       if (!zlib::isAvailable() ||
           !consumeCompressedDebugSectionHeader(data, OriginalSize))
         continue;
-      OwningPtr<MemoryBuffer> UncompressedSection;
+      std::unique_ptr<MemoryBuffer> UncompressedSection;
       if (zlib::uncompress(data, UncompressedSection, OriginalSize) !=
           zlib::StatusOK)
         continue;

llvm/lib/DebugInfo/DWARFContext.h

diff --git a/llvm/lib/DebugInfo/DWARFContext.h b/llvm/lib/DebugInfo/DWARFContext.h
index 823e98a..96eaa70 100644
--- a/llvm/lib/DebugInfo/DWARFContext.h
+++ b/llvm/lib/DebugInfo/DWARFContext.h
@@ -18,7 +18,6 @@
 #include "DWARFDebugRangeList.h"
 #include "DWARFTypeUnit.h"
 #include "llvm/ADT/MapVector.h"
-#include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/DebugInfo/DIContext.h"
 
@@ -31,15 +30,15 @@
 class DWARFContext : public DIContext {
   SmallVector<DWARFCompileUnit *, 1> CUs;
   SmallVector<DWARFTypeUnit *, 1> TUs;
-  OwningPtr<DWARFDebugAbbrev> Abbrev;
-  OwningPtr<DWARFDebugLoc> Loc;
-  OwningPtr<DWARFDebugAranges> Aranges;
-  OwningPtr<DWARFDebugLine> Line;
-  OwningPtr<DWARFDebugFrame> DebugFrame;
+  std::unique_ptr<DWARFDebugAbbrev> Abbrev;
+  std::unique_ptr<DWARFDebugLoc> Loc;
+  std::unique_ptr<DWARFDebugAranges> Aranges;
+  std::unique_ptr<DWARFDebugLine> Line;
+  std::unique_ptr<DWARFDebugFrame> DebugFrame;
 
   SmallVector<DWARFCompileUnit *, 1> DWOCUs;
   SmallVector<DWARFTypeUnit *, 1> DWOTUs;
-  OwningPtr<DWARFDebugAbbrev> AbbrevDWO;
+  std::unique_ptr<DWARFDebugAbbrev> AbbrevDWO;
 
   DWARFContext(DWARFContext &) LLVM_DELETED_FUNCTION;
   DWARFContext &operator=(DWARFContext &) LLVM_DELETED_FUNCTION;

llvm/lib/DebugInfo/DWARFUnit.h

diff --git a/llvm/lib/DebugInfo/DWARFUnit.h b/llvm/lib/DebugInfo/DWARFUnit.h
index d7d9aa2..5b4cf09 100644
--- a/llvm/lib/DebugInfo/DWARFUnit.h
+++ b/llvm/lib/DebugInfo/DWARFUnit.h
@@ -14,7 +14,6 @@
 #include "DWARFDebugInfoEntry.h"
 #include "DWARFDebugRangeList.h"
 #include "DWARFRelocMap.h"
-#include "llvm/ADT/OwningPtr.h"
 #include <vector>
 
 namespace llvm {
@@ -50,14 +49,14 @@
   std::vector<DWARFDebugInfoEntryMinimal> DieArray;
 
   class DWOHolder {
-    OwningPtr<object::ObjectFile> DWOFile;
-    OwningPtr<DWARFContext> DWOContext;
+    std::unique_ptr<object::ObjectFile> DWOFile;
+    std::unique_ptr<DWARFContext> DWOContext;
     DWARFUnit *DWOU;
   public:
     DWOHolder(object::ObjectFile *DWOFile);
     DWARFUnit *getUnit() const { return DWOU; }
   };
-  OwningPtr<DWOHolder> DWO;
+  std::unique_ptr<DWOHolder> DWO;
 
 protected:
   virtual bool extractImpl(DataExtractor debug_info, uint32_t *offset_ptr);