Merge pull request #163 from frasercrmck/fix-use-after-move

[host] Fix move-after-move errors
uxlfoundation · Oct 17, 2023 · ec5bcfb · ec5bcfb
2 parents 6b333da + 0551bc3
commit ec5bcfb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/modules/compiler/targets/host/source/kernel.cpp b/modules/compiler/targets/host/source/kernel.cpp
@@ -334,8 +334,9 @@ HostKernel::lookupOrCreateOptimizedKernel(std::array<size_t, 3> local_size) {
       if (auto callback = target.getNotifyCallbackFn()) {
         callback(llvm::toString(std::move(err)).c_str(), /*data*/ nullptr,
                  /*data_size*/ 0);
+      } else {
+        llvm::consumeError(std::move(err));
       }
-      llvm::consumeError(std::move(err));
       return cargo::make_unexpected(compiler::Result::FINALIZE_PROGRAM_FAILURE);
     }
     // Register this JITDylib so we can clear up its resources later.
@@ -362,8 +363,9 @@ HostKernel::lookupOrCreateOptimizedKernel(std::array<size_t, 3> local_size) {
       if (auto callback = target.getNotifyCallbackFn()) {
         callback(llvm::toString(std::move(err)).c_str(), /*data*/ nullptr,
                  /*data_size*/ 0);
+      } else {
+        llvm::consumeError(std::move(err));
       }
-      llvm::consumeError(std::move(err));
       return cargo::make_unexpected(compiler::Result::FINALIZE_PROGRAM_FAILURE);
     }
 
@@ -374,8 +376,9 @@ HostKernel::lookupOrCreateOptimizedKernel(std::array<size_t, 3> local_size) {
       if (auto callback = target.getNotifyCallbackFn()) {
         callback(llvm::toString(std::move(err)).c_str(), /*data*/ nullptr,
                  /*data_size*/ 0);
+      } else {
+        llvm::consumeError(std::move(err));
       }
-      llvm::consumeError(std::move(err));
       return cargo::make_unexpected(compiler::Result::FINALIZE_PROGRAM_FAILURE);
     }
 
@@ -390,8 +393,9 @@ HostKernel::lookupOrCreateOptimizedKernel(std::array<size_t, 3> local_size) {
         if (auto callback = target.getNotifyCallbackFn()) {
           callback(llvm::toString(std::move(err)).c_str(), /*data*/ nullptr,
                    /*data_size*/ 0);
+        } else {
+          llvm::consumeError(std::move(err));
         }
-        llvm::consumeError(std::move(err));
         return cargo::make_unexpected(
             compiler::Result::FINALIZE_PROGRAM_FAILURE);
       }

diff --git a/modules/compiler/targets/host/source/target.cpp b/modules/compiler/targets/host/source/target.cpp
@@ -228,8 +228,9 @@ compiler::Result HostTarget::initWithBuiltins(
     if (auto callback = getNotifyCallbackFn()) {
       callback(llvm::toString(std::move(err)).c_str(), /*data*/ nullptr,
                /*data_size*/ 0);
+    } else {
+      llvm::consumeError(std::move(err));
     }
-    llvm::consumeError(std::move(err));
     return compiler::Result::OUT_OF_MEMORY;
   }
   orc_engine = std::move(*JIT);
@@ -239,8 +240,9 @@ compiler::Result HostTarget::initWithBuiltins(
     if (auto callback = getNotifyCallbackFn()) {
       callback(llvm::toString(std::move(err)).c_str(), /*data*/ nullptr,
                /*data_size*/ 0);
+    } else {
+      llvm::consumeError(std::move(err));
     }
-    llvm::consumeError(std::move(err));
     return compiler::Result::FAILURE;
   }
   target_machine = std::move(*TM);