[llvm] 07ffcef - [dsymutil] Fix conversion between unique_ptr and Expected

[Jonas Devlieghere via llvm-commits]

Author: Jonas Devlieghere
Date: 2020-05-21T11:42:04-07:00
New Revision: 07ffcef469cb7f6a97bc0227fb0966264ca902ce

URL: https://github.com/llvm/llvm-project/commit/07ffcef469cb7f6a97bc0227fb0966264ca902ce
DIFF: https://github.com/llvm/llvm-project/commit/07ffcef469cb7f6a97bc0227fb0966264ca902ce.diff

LOG: [dsymutil] Fix conversion between unique_ptr and Expected

Reproducer.cpp:70:12: error: could not convert ‘Repro’ from
‘std::unique_ptr<llvm::dsymutil::ReproducerGenerate,
std::default_delete<llvm::dsymutil::ReproducerGenerate> >’ to
‘llvm::Expected<std::unique_ptr<llvm::dsymutil::Reproducer> >’

Added: 
    

Modified: 
    llvm/tools/dsymutil/Reproducer.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/tools/dsymutil/Reproducer.cpp b/llvm/tools/dsymutil/Reproducer.cpp
index 53e4bda375df..448736d702e4 100644
--- a/llvm/tools/dsymutil/Reproducer.cpp
+++ b/llvm/tools/dsymutil/Reproducer.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/Path.h"
 #include "Reproducer.h"
+#include "llvm/Support/Path.h"
 
 using namespace llvm;
 using namespace llvm::dsymutil;
@@ -64,17 +64,19 @@ Reproducer::createReproducer(ReproducerMode Mode, StringRef Root) {
   switch (Mode) {
   case ReproducerMode::Generate: {
     std::error_code EC;
-    auto Repro = std::make_unique<ReproducerGenerate>(EC);
+    std::unique_ptr<Reproducer> Repro =
+        std::make_unique<ReproducerGenerate>(EC);
     if (EC)
       return errorCodeToError(EC);
-    return Repro;
+    return std::move(Repro);
   }
   case ReproducerMode::Use: {
     std::error_code EC;
-    auto Repro = std::make_unique<ReproducerUse>(Root, EC);
+    std::unique_ptr<Reproducer> Repro =
+        std::make_unique<ReproducerUse>(Root, EC);
     if (EC)
       return errorCodeToError(EC);
-    return Repro;
+    return std::move(Repro);
   }
   case ReproducerMode::Off:
     return std::make_unique<Reproducer>();