Make ~mutex trivial (#4390)

CaseyCarter · web-flow · commit b99404ef5bac · 2024-02-16T12:47:47.000-08:00
diff --git a/stl/inc/mutex b/stl/inc/mutex
@@ -45,10 +45,6 @@ public:
     }
 #endif // ^^^ !defined(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR) ^^^
 
-    ~_Mutex_base() noexcept {
-        _Mtx_destroy_in_situ(_Mymtx());
-    }
-
     _Mutex_base(const _Mutex_base&)            = delete;
     _Mutex_base& operator=(const _Mutex_base&) = delete;
 
diff --git a/stl/inc/xthreads.h b/stl/inc/xthreads.h
@@ -101,7 +101,6 @@ _CRTIMP2_PURE _Thrd_result __cdecl _Mtx_init(_Mtx_t*, int) noexcept;
 _CRTIMP2_PURE void __cdecl _Mtx_destroy(_Mtx_t) noexcept;
 #endif // _CRTBLD
 _CRTIMP2_PURE void __cdecl _Mtx_init_in_situ(_Mtx_t, int) noexcept;
-_CRTIMP2_PURE void __cdecl _Mtx_destroy_in_situ(_Mtx_t) noexcept;
 _CRTIMP2_PURE int __cdecl _Mtx_current_owns(_Mtx_t) noexcept;
 _CRTIMP2_PURE _Thrd_result __cdecl _Mtx_lock(_Mtx_t) noexcept;
 _CRTIMP2_PURE _Thrd_result __cdecl _Mtx_trylock(_Mtx_t) noexcept;
diff --git a/stl/src/mutex.cpp b/stl/src/mutex.cpp
@@ -44,6 +44,7 @@ _CRTIMP2_PURE void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int type) noexcept { //
     mtx->_Count     = 0;
 }
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE void __cdecl _Mtx_destroy_in_situ(_Mtx_t mtx) noexcept { // destroy mutex in situ
     _THREAD_ASSERT(mtx->_Count == 0, "mutex destroyed while busy");
     (void) mtx;
@@ -64,6 +65,7 @@ _CRTIMP2_PURE _Thrd_result __cdecl _Mtx_init(_Mtx_t* mtx, int type) noexcept { /
     return _Thrd_result::_Success;
 }
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE void __cdecl _Mtx_destroy(_Mtx_t mtx) noexcept { // destroy mutex
     if (mtx) { // something to do, do it
         _Mtx_destroy_in_situ(mtx);

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,6 @@ public:`
`45`	`45`	`}`
`46`	`46`	`#endif // ^^^ !defined(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR) ^^^`
`47`	`47`
`48`		`- ~_Mutex_base() noexcept {`
`49`		`- _Mtx_destroy_in_situ(_Mymtx());`
`50`		`- }`
`51`		`-`
`52`	`48`	`_Mutex_base(const _Mutex_base&) = delete;`
`53`	`49`	`_Mutex_base& operator=(const _Mutex_base&) = delete;`
`54`	`50`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ _CRTIMP2_PURE void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int type) noexcept { //`
`44`	`44`	`mtx->_Count = 0;`
`45`	`45`	`}`
`46`	`46`
	`47`	`+// TRANSITION, ABI: preserved for binary compatibility`
`47`	`48`	`_CRTIMP2_PURE void __cdecl _Mtx_destroy_in_situ(_Mtx_t mtx) noexcept { // destroy mutex in situ`
`48`	`49`	`_THREAD_ASSERT(mtx->_Count == 0, "mutex destroyed while busy");`
`49`	`50`	`(void) mtx;`
`@@ -64,6 +65,7 @@ _CRTIMP2_PURE _Thrd_result __cdecl _Mtx_init(_Mtx_t* mtx, int type) noexcept { /`
`64`	`65`	`return _Thrd_result::_Success;`
`65`	`66`	`}`
`66`	`67`
	`68`	`+// TRANSITION, ABI: preserved for binary compatibility`
`67`	`69`	`_CRTIMP2_PURE void __cdecl _Mtx_destroy(_Mtx_t mtx) noexcept { // destroy mutex`
`68`	`70`	`if (mtx) { // something to do, do it`
`69`	`71`	`_Mtx_destroy_in_situ(mtx);`