From eebaf5f2701e7d0417c4a06fbb824222aa384555 Mon Sep 17 00:00:00 2001
From: Dmitri Smirnov <yuslepukhin@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:08:17 -0700
Subject: [PATCH] Adjust and fixx abseil-cpp debugging visualization (#12415)

Move abseil-cpp.natvis file, add it to PDB, adjust visualization
---
 cmake/external/abseil-cpp.cmake                    |  4 ++++
 {tools/natvis => cmake/external}/abseil-cpp.natvis | 12 ++++++------
 cmake/onnxruntime_common.cmake                     |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 rename {tools/natvis => cmake/external}/abseil-cpp.natvis (82%)

diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake
index 816f0ab53e..cefc65f28e 100644
--- a/cmake/external/abseil-cpp.cmake
+++ b/cmake/external/abseil-cpp.cmake
@@ -13,6 +13,10 @@ else()
   set(ABSL_PATCH_COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/abseil/Fix_Nvidia_Build_Break.patch)
 endif()
 
+# NB! Advancing Abseil version changes its internal namespace,
+# currently absl::lts_20211102 which affects abseil-cpp.natvis debugger
+# visualization file, that must be adjusted accordingly, unless we eliminate
+# that namespace at build time.
 FetchContent_Declare(
     abseil_cpp
     PREFIX "${CMAKE_CURRENT_BINARY_DIR}/abseil-cpp"
diff --git a/tools/natvis/abseil-cpp.natvis b/cmake/external/abseil-cpp.natvis
similarity index 82%
rename from tools/natvis/abseil-cpp.natvis
rename to cmake/external/abseil-cpp.natvis
index ed5ef413af..c9f3a93f24 100644
--- a/tools/natvis/abseil-cpp.natvis
+++ b/cmake/external/abseil-cpp.natvis
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="absl::InlinedVector&lt;*&gt;">
-    <DisplayString>{{ size={storage_.metadata_.value >> 1} }}</DisplayString>
+  <Type Name="absl::lts_20211102::InlinedVector&lt;*&gt;">
+    <DisplayString>{{ size={ storage_.metadata_.value >> 1 } }}</DisplayString>
     <Expand>
-      <Item Name="[N]" ExcludeView="simple">$T2</Item>
       <Item Name="[capacity]" ExcludeView="simple" Condition="(storage_.metadata_.value &amp; 1) == 0">$T2</Item>
       <Item Name="[capacity]" ExcludeView="simple" Condition="(storage_.metadata_.value &amp; 1) == 1">storage_.data_.allocated.allocated_capacity</Item>
-      <Item Name="[allocator]" ExcludeView="simple">storage_.metadata_</Item>
+      <Item Name="[N]" ExcludeView="simple">$T2</Item>
+      <Item Name="[allocator]" ExcludeView="simple" Condition="(storage_.metadata_.value &amp; 1) == 1">storage_.metadata_</Item>
       <IndexListItems Condition="(storage_.metadata_.value &amp; 1) == 0">
         <Size>storage_.metadata_.value &gt;&gt; 1</Size>
         <ValueNode>(($T1 &amp;)(storage_.data_.inlined.inlined_data[$i]))</ValueNode>
@@ -18,7 +18,7 @@
     </Expand>
   </Type>
   <!-- Should handle both flat hash_set and hash_map -->
-  <Type Name="absl::container_internal::raw_hash_set&lt;*&gt;">
+  <Type Name="absl::lts_20211102::container_internal::raw_hash_set&lt;*&gt;">
     <DisplayString Condition="size_ == 0">empty</DisplayString>
     <DisplayString>{{ size={size_} }}</DisplayString>
     <Expand>
@@ -38,7 +38,7 @@
       </CustomListItems>
     </Expand>
   </Type>
-  <Type Name="absl::container_internal::map_slot_type&lt;*&gt;">
+  <Type Name="absl::lts_20211102::container_internal::map_slot_type&lt;*&gt;">
     <DisplayString>{{ {value.first}:{value.second} }}</DisplayString>
     <Expand>
       <Item Name="[key]" ExcludeView="simple">value.first</Item>
diff --git a/cmake/onnxruntime_common.cmake b/cmake/onnxruntime_common.cmake
index a8ca9c9254..c0defbadc1 100644
--- a/cmake/onnxruntime_common.cmake
+++ b/cmake/onnxruntime_common.cmake
@@ -110,6 +110,13 @@ endif()
 
 if(NOT onnxruntime_DISABLE_ABSEIL)
   include(external/abseil-cpp.cmake)
+  if (MSVC)
+    set(ABSEIL_NATVIS_FILE "abseil-cpp.natvis")
+    target_sources(
+        onnxruntime_common
+        INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/${ABSEIL_NATVIS_FILE}>
+    )
+  endif()
 endif()
 
 onnxruntime_add_include_to_target(onnxruntime_common date_interface wil)