From 7982d1ea2c5eb2ea2261fd82ebd7eebdda0e58b3 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 14 Jul 2022 20:58:48 +0200 Subject: Merge llvm-project main llvmorg-15-init-16436-g18a6ab5b8d1f This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-15-init-16436-g18a6ab5b8d1f. PR: 265425 MFC after: 2 weeks (cherry picked from commit 753f127f3ace09432b2baeffd71a308760641a62) --- contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewError.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewError.cpp') diff --git a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewError.cpp b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewError.cpp index d12f6c796e50..74803a3e495a 100644 --- a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewError.cpp +++ b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewError.cpp @@ -8,7 +8,6 @@ #include "llvm/DebugInfo/CodeView/CodeViewError.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/ManagedStatic.h" #include using namespace llvm; @@ -42,9 +41,9 @@ public: }; } // namespace -static llvm::ManagedStatic CodeViewErrCategory; const std::error_category &llvm::codeview::CVErrorCategory() { - return *CodeViewErrCategory; + static CodeViewErrorCategory CodeViewErrCategory; + return CodeViewErrCategory; } char CodeViewError::ID; -- cgit v1.2.3