Revert "R600: Move code for generating REGISTER_LOAD into R600ISelLowering.cpp"

[oota-llvm.git] / lib / Object / Object.cpp

diff --git a/lib/Object/Object.cpp b/lib/Object/Object.cpp
index 567d87f7a0e56509f5c6d6add7a2173d9f4b61ed..2b3861b4bdc1c309b988b5cc56215b6ab0cf894f 100644 (file)
--- a/lib/Object/Object.cpp
+++ b/lib/Object/Object.cpp
@@ -60,9 +60,10 @@ wrap(const relocation_iterator *SI) {
 // ObjectFile creation
 LLVMObjectFileRef LLVMCreateObjectFile(LLVMMemoryBufferRef MemBuf) {
   std::unique_ptr<MemoryBuffer> Buf(unwrap(MemBuf));
-  ErrorOr<ObjectFile *> ObjOrErr(ObjectFile::createObjectFile(Buf));
+  ErrorOr<std::unique_ptr<ObjectFile>> ObjOrErr(
+      ObjectFile::createObjectFile(Buf));
   Buf.release();
-  ObjectFile *Obj = ObjOrErr ? ObjOrErr.get() : nullptr;
+  ObjectFile *Obj = ObjOrErr ? ObjOrErr.get().release() : nullptr;
   return wrap(Obj);
 }