16 lines
772 B
Diff
16 lines
772 B
Diff
diff --git a/llvm/include/llvm/Support/ManagedStatic.h b/llvm/include/llvm/Support/ManagedStatic.h
|
|
index bbd0d04ed..f2b41422f 100644
|
|
--- a/llvm/include/llvm/Support/ManagedStatic.h
|
|
+++ b/llvm/include/llvm/Support/ManagedStatic.h
|
|
@@ -40,8 +40,8 @@ template <typename T, size_t N> struct object_deleter<T[N]> {
|
|
// constexpr, a dynamic initializer may be emitted depending on optimization
|
|
// settings. For the affected versions of MSVC, use the old linker
|
|
// initialization pattern of not providing a constructor and leaving the fields
|
|
-// uninitialized.
|
|
-#if !defined(_MSC_VER) || defined(__clang__)
|
|
+// uninitialized. See http://llvm.org/PR41367 for details.
|
|
+#if !defined(_MSC_VER) || (_MSC_VER >= 1925) || defined(__clang__)
|
|
#define LLVM_USE_CONSTEXPR_CTOR
|
|
#endif
|
|
|