commit 10a27df8ff9856ef975f1feae676403cc9ed5980
author David Blaikie <dblaikie@gmail.com> Wed Sep 03 17:59:23 2014 +0000
committer David Blaikie <dblaikie@gmail.com> Wed Sep 03 17:59:23 2014 +0000
tree 4bfe3d705b4d253327b7696f835dce96673c1fc8
parent 94e46f3eb85c69289e775bb9f41ae55f225f84b8

unique_ptrify IRObjectFile::createIRObjectFile

I took a guess at the changes to the gold plugin, because that doesn't
seem to build by default for me. Not sure what dependencies I might be
missing for that.

llvm-svn: 217056

llvm/lib/Object/IRObjectFile.cpp

diff --git a/llvm/lib/Object/IRObjectFile.cpp b/llvm/lib/Object/IRObjectFile.cpp
index 0259b46..856f4c6 100644
--- a/llvm/lib/Object/IRObjectFile.cpp
+++ b/llvm/lib/Object/IRObjectFile.cpp
@@ -264,7 +264,7 @@
   return basic_symbol_iterator(BasicSymbolRef(Ret, this));
 }
 
-ErrorOr<IRObjectFile *>
+ErrorOr<std::unique_ptr<IRObjectFile>>
 llvm::object::IRObjectFile::createIRObjectFile(MemoryBufferRef Object,
                                                LLVMContext &Context) {
 
@@ -275,5 +275,5 @@
     return EC;
 
   std::unique_ptr<Module> M(MOrErr.get());
-  return new IRObjectFile(Object, std::move(M));
+  return llvm::make_unique<IRObjectFile>(Object, std::move(M));
 }

llvm/lib/Object/SymbolicFile.cpp

diff --git a/llvm/lib/Object/SymbolicFile.cpp b/llvm/lib/Object/SymbolicFile.cpp
index 17624a3..f8dd4b3 100644
--- a/llvm/lib/Object/SymbolicFile.cpp
+++ b/llvm/lib/Object/SymbolicFile.cpp
@@ -33,8 +33,7 @@
   switch (Type) {
   case sys::fs::file_magic::bitcode:
     if (Context)
-      return ErrorOr<std::unique_ptr<SymbolicFile>>(
-          IRObjectFile::createIRObjectFile(Object, *Context));
+      return IRObjectFile::createIRObjectFile(Object, *Context);
   // Fallthrough
   case sys::fs::file_magic::unknown:
   case sys::fs::file_magic::archive: