[llvm] 6f87b99 - [ADT] Use more explicit from to initialize member. Appease MSVC?

[Sam McCall via llvm-commits]

Author: Sam McCall
Date: 2020-06-29T22:22:12+02:00
New Revision: 6f87b99a79a239edb04bf9d0818a529aa5c31f4b

URL: https://github.com/llvm/llvm-project/commit/6f87b99a79a239edb04bf9d0818a529aa5c31f4b
DIFF: https://github.com/llvm/llvm-project/commit/6f87b99a79a239edb04bf9d0818a529aa5c31f4b.diff

LOG: [ADT] Use more explicit from to initialize member. Appease MSVC?

Or at least get a clearer error message:
http://lab.llvm.org:8011/builders/mlir-windows/builds/3958/steps/build-unified-tree/logs/stdio

Added: 
    

Modified: 
    llvm/include/llvm/ADT/FunctionExtras.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ADT/FunctionExtras.h b/llvm/include/llvm/ADT/FunctionExtras.h
index b675889bce33..4c75e4d2547b 100644
--- a/llvm/include/llvm/ADT/FunctionExtras.h
+++ b/llvm/include/llvm/ADT/FunctionExtras.h
@@ -249,8 +249,8 @@ template <typename ReturnT, typename... ParamTs> class UniqueFunctionBase {
 
     // Now move into the storage.
     new (CallableAddr) CallableT(std::move(Callable));
-    CallbackAndInlineFlag = {&CallbacksHolder<CallableT, CalledAsT>::Callbacks,
-                             IsInlineStorage};
+    CallbackAndInlineFlag.setPointerAndInt(
+        &CallbacksHolder<CallableT, CalledAsT>::Callbacks, IsInlineStorage);
   }
 
   ~UniqueFunctionBase() {