Standard Library Modules: Fix spurious _Init_locks dllexport (#3233)

stl/inc/yvals.h

@@ -454,26 +454,6 @@ class _CRTIMP2_PURE_IMPORT _EmptyLockit { // empty lock class used for bin compa
 #endif // _M_CEE
 
 #ifdef _CRTBLD
-class _CRTIMP2_PURE_IMPORT _Init_locks { // initialize mutexes
-public:
-#ifdef _M_CEE_PURE
-    __CLR_OR_THIS_CALL _Init_locks() noexcept {
-        _Init_locks_ctor(this);
-    }
-
-    __CLR_OR_THIS_CALL ~_Init_locks() noexcept {
-        _Init_locks_dtor(this);
-    }
-
-#else // _M_CEE_PURE
-    __thiscall _Init_locks() noexcept;
-    __thiscall ~_Init_locks() noexcept;
-#endif // _M_CEE_PURE
-
-private:
-    static void __cdecl _Init_locks_ctor(_Init_locks*) noexcept;
-    static void __cdecl _Init_locks_dtor(_Init_locks*) noexcept;
-};
 
 #ifdef _M_CEE
 #define _RELIABILITY_CONTRACT                                                    \

stl/src/cerr.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/cin.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/clog.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #ifndef MRTDLL
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)

stl/src/cout.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/init_locks.hpp

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#pragma once
+
+#include <yvals.h>
+
+_STD_BEGIN
+
+class _CRTIMP2_PURE_IMPORT _Init_locks { // initialize mutexes
+public:
+#ifdef _M_CEE_PURE
+    __CLR_OR_THIS_CALL _Init_locks() noexcept {
+        _Init_locks_ctor(this);
+    }
+
+    __CLR_OR_THIS_CALL ~_Init_locks() noexcept {
+        _Init_locks_dtor(this);
+    }
+
+#else // _M_CEE_PURE
+    __thiscall _Init_locks() noexcept;
+    __thiscall ~_Init_locks() noexcept;
+#endif // _M_CEE_PURE
+
+private:
+    static void __cdecl _Init_locks_ctor(_Init_locks*) noexcept;
+    static void __cdecl _Init_locks_dtor(_Init_locks*) noexcept;
+};
+
+_STD_END

stl/src/iosptrs.cpp

@@ -6,6 +6,9 @@
 #include <iostream>
 
 #include <Windows.h>
+
+#include "init_locks.hpp"
+
 _STD_BEGIN
 
 #if defined(_M_CEE) && !defined(_M_CEE_MIXED)

stl/src/stacktrace.cpp

@@ -6,8 +6,6 @@
 // Do not include or define anything else here.
 // In particular, basic_string must not be included here.
 
-#include <yvals.h>
-
 #include <cstdio>
 #include <cstdlib>
 
@@ -166,7 +164,9 @@ namespace {
 
                 off = string_fill(fill, off + max_disp_num, str, [displacement, off](char* s, size_t) {
                     const int ret = std::snprintf(s + off, max_disp_num, "+0x%llX", displacement);
-                    _STL_VERIFY(ret > 0, "formatting error");
+                    if (ret <= 0) {
+                        std::abort(); // formatting error
+                    }
                     return off + ret;
                 });
             }
@@ -230,7 +230,9 @@ namespace {
 
                 off = string_fill(fill, off + max_line_num, str, [line, off](char* s, size_t) {
                     const int ret = std::snprintf(s + off, max_line_num, "(%u): ", line);
-                    _STL_VERIFY(ret > 0, "formatting error");
+                    if (ret <= 0) {
+                        std::abort(); // formatting error
+                    }
                     return off + ret;
                 });
             }
@@ -331,7 +333,9 @@ void __stdcall __std_stacktrace_to_string(const void* const* const _Addresses, c
 
         off = string_fill(_Fill, off + max_entry_num, _Str, [off, i](char* s, size_t) {
             const int ret = std::snprintf(s + off, max_entry_num, "%u> ", static_cast<unsigned int>(i));
-            _STL_VERIFY(ret > 0, "formatting error");
+            if (ret <= 0) {
+                std::abort(); // formatting error
+            }
             return off + ret;
         });
 

stl/src/syncstream.cpp

@@ -11,6 +11,8 @@
 #include <shared_mutex>
 #include <utility>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/taskscheduler.cpp

@@ -9,6 +9,7 @@
 #include <Windows.h>
 
 #include "awint.hpp"
+#include "init_locks.hpp"
 
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)

stl/src/wcerr.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/wcin.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/wclog.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/wcout.cpp

@@ -6,6 +6,8 @@
 #include <fstream>
 #include <iostream>
 
+#include "init_locks.hpp"
+
 #pragma warning(disable : 4074)
 #pragma init_seg(compiler)
 static std::_Init_locks initlocks;

stl/src/xlock.cpp

@@ -8,6 +8,7 @@
 #include <clocale>
 #include <cstdlib>
 
+#include "init_locks.hpp"
 #include "xmtx.hpp"
 
 _STD_BEGIN