From f77de88e0e06c04636db3582c80a2bc1099f5972 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <fsb4000@yandex.ru>
Date: Sun, 26 Jun 2022 06:04:00 +0700
Subject: [PATCH] fix hash_* visualizer issue (#2784)

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 68f97a945d1..095b8d08245 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1443,15 +1443,26 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
       </Expand>
   </Type>
 
+  <!-- VC 2015 - must have higher priority -->
+  <Type Name="stdext::hash_map&lt;*&gt;" Priority="Medium">
+      <AlternativeType Name="stdext::hash_multimap&lt;*&gt;" />
+      <AlternativeType Name="stdext::hash_set&lt;*&gt;" />
+      <AlternativeType Name="stdext::hash_multiset&lt;*&gt;" />
+      <DisplayString>{_List}</DisplayString>
+      <Expand>
+          <Item Name="[bucket_count]" IncludeView="detailed">_Maxidx</Item>
+          <Item Name="[load_factor]" IncludeView="detailed">((float)_List._Mypair._Myval2._Mysize) / ((float)_Maxidx)</Item>
+          <Item Name="[max_load_factor]" IncludeView="detailed">_Traitsobj._Max_buckets</Item>
+          <Item Name="[allocator]" ExcludeView="simple">_List._Mypair</Item>
+          <ExpandedItem>_List,view(simple)</ExpandedItem>
+      </Expand>
+  </Type>
+
   <!-- VC 2015 - must have higher priority -->
   <Type Name="std::unordered_map&lt;*&gt;" Priority="Medium">
       <AlternativeType Name="std::unordered_multimap&lt;*&gt;" />
       <AlternativeType Name="std::unordered_set&lt;*&gt;" />
       <AlternativeType Name="std::unordered_multiset&lt;*&gt;" />
-      <AlternativeType Name="stdext::hash_map&lt;*&gt;" />
-      <AlternativeType Name="stdext::hash_multimap&lt;*&gt;" />
-      <AlternativeType Name="stdext::hash_set&lt;*&gt;" />
-      <AlternativeType Name="stdext::hash_multiset&lt;*&gt;" />
       <DisplayString>{_List}</DisplayString>
       <Expand>
           <Item Name="[bucket_count]" IncludeView="detailed">_Maxidx</Item>