From: Justin Bogner <mail@justinbogner.com>
Date: Tue, 18 Oct 2016 05:17:23 +0000 (+0000)
Subject: Object: Add a missing return in ObjectFile::createObjectFile
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3c2bab0a72f88705b6ba763aab51b411ded12ae;p=llvm

Object: Add a missing return in ObjectFile::createObjectFile

When Error was threaded through these APIs back in r265606 the
"return" was missed here, which triggers a warning if/when I add
LLVM_NODISCARD to the Error type.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@284454 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp
index 92f9c1f4f0a..bd50773417c 100644
--- a/lib/Object/ObjectFile.cpp
+++ b/lib/Object/ObjectFile.cpp
@@ -118,8 +118,8 @@ ObjectFile::createObjectFile(StringRef ObjectPath) {
 
   Expected<std::unique_ptr<ObjectFile>> ObjOrErr =
       createObjectFile(Buffer->getMemBufferRef());
-  if (!ObjOrErr)
-    ObjOrErr.takeError();
+  if (Error Err = ObjOrErr.takeError())
+    return std::move(Err);
   std::unique_ptr<ObjectFile> Obj = std::move(ObjOrErr.get());
 
   return OwningBinary<ObjectFile>(std::move(Obj), std::move(Buffer));