From 86cc5cb468382868a4d3d110c5887a6b3507188c Mon Sep 17 00:00:00 2001
From: "A. Jiang" <de34@live.cn>
Date: Thu, 6 Jul 2023 00:18:59 +0800
Subject: [PATCH 1/2] Simplify visualizer for `mutex`

---
 stl/debugger/STL.natvis | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 096e2756d5c..43647da2db3 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1584,15 +1584,11 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
   <Type Name="std::mutex">
       <AlternativeType Name="std::recursive_mutex"/>
-      <DisplayString Condition="sizeof(void *) == 4u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 44) == 0">unlocked</DisplayString>
-      <DisplayString Condition="sizeof(void *) == 4u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 44) != 0">locked</DisplayString>
-      <DisplayString Condition="sizeof(void *) == 8u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 76) == 0">unlocked</DisplayString>
-      <DisplayString Condition="sizeof(void *) == 8u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 76) != 0">locked</DisplayString>
-      <Expand>
-          <Item Name="[locking_thread_id]" Condition="sizeof(void *) == 4u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 44) != 0">*(long *)((char *)(&amp;_Mtx_storage) + 40)</Item>
-          <Item Name="[locking_thread_id]" Condition="sizeof(void *) == 8u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 76) != 0">*(long *)((char *)(&amp;_Mtx_storage) + 72)</Item>
-          <Item Name="[ownership_levels]" Condition="sizeof(void *) == 4u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 44) != 0">*(int *)((char *)(&amp;_Mtx_storage) + 44)</Item>
-          <Item Name="[ownership_levels]" Condition="sizeof(void *) == 8u &amp;&amp; *(int *)((char *)(&amp;_Mtx_storage) + 76) != 0">*(int *)((char *)(&amp;_Mtx_storage) + 76)</Item>
+      <DisplayString Condition="_Mtx_storage_mirror._Count == 0">unlocked</DisplayString>
+      <DisplayString Condition="_Mtx_storage_mirror._Count != 0">locked</DisplayString>
+      <Expand>
+          <Item Name="[locking_thread_id]" Condition="_Mtx_storage_mirror._Count != 0">_Mtx_storage_mirror._Thread_id</Item>
+          <Item Name="[ownership_levels]" Condition="_Mtx_storage_mirror._Count != 0">_Mtx_storage_mirror._Count</Item>
       </Expand>
   </Type>
 

From 8551939c4471fe4d043af885b68b3ccccd822223 Mon Sep 17 00:00:00 2001
From: "A. Jiang" <de34@live.cn>
Date: Fri, 21 Jul 2023 08:07:49 +0800
Subject: [PATCH 2/2] Change `_Mtx_storage_mirror` to `_Mtx_storage`

---
 stl/debugger/STL.natvis | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 43647da2db3..a3047ef51d3 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1584,11 +1584,11 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
   <Type Name="std::mutex">
       <AlternativeType Name="std::recursive_mutex"/>
-      <DisplayString Condition="_Mtx_storage_mirror._Count == 0">unlocked</DisplayString>
-      <DisplayString Condition="_Mtx_storage_mirror._Count != 0">locked</DisplayString>
+      <DisplayString Condition="_Mtx_storage._Count == 0">unlocked</DisplayString>
+      <DisplayString Condition="_Mtx_storage._Count != 0">locked</DisplayString>
       <Expand>
-          <Item Name="[locking_thread_id]" Condition="_Mtx_storage_mirror._Count != 0">_Mtx_storage_mirror._Thread_id</Item>
-          <Item Name="[ownership_levels]" Condition="_Mtx_storage_mirror._Count != 0">_Mtx_storage_mirror._Count</Item>
+          <Item Name="[locking_thread_id]" Condition="_Mtx_storage._Count != 0">_Mtx_storage._Thread_id</Item>
+          <Item Name="[ownership_levels]" Condition="_Mtx_storage._Count != 0">_Mtx_storage._Count</Item>
       </Expand>
   </Type>