[llvm] 51b2015 - [JITLink] Apply MSVCPError workaround to a1fc26030a42.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2020-07-13T11:55:50-07:00
New Revision: 51b20152e66cc6f092675d36b8367320bda31955

URL: https://github.com/llvm/llvm-project/commit/51b20152e66cc6f092675d36b8367320bda31955
DIFF: https://github.com/llvm/llvm-project/commit/51b20152e66cc6f092675d36b8367320bda31955.diff

LOG: [JITLink] Apply MSVCPError workaround to a1fc26030a42.

Hopefully this will get the Windows bots building again.

Added: 
    

Modified: 
    llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h b/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h
index 3bb56f4d9615..0c8514a60a50 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h
@@ -17,6 +17,7 @@
 #include "llvm/ExecutionEngine/JITSymbol.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/Memory.h"
+#include "llvm/Support/MSVCErrorWorkarounds.h"
 
 #include <cstdint>
 #include <future>
@@ -78,7 +79,7 @@ class JITLinkMemoryManager {
 
     /// Calls finalizeAsync and waits for completion.
     Error finalize() {
-      std::promise<Error> FinalizeResultP;
+      std::promise<MSVCPError> FinalizeResultP;
       auto FinalizeResultF = FinalizeResultP.get_future();
       finalizeAsync(
           [&](Error Err) { FinalizeResultP.set_value(std::move(Err)); });