From aea404e4d5e3c4b96caf1b26bdee16dbacf67f32 Mon Sep 17 00:00:00 2001
From: Thays Grazia <thaystg@gmail.com>
Date: Mon, 15 May 2023 18:15:44 -0300
Subject: [PATCH] [debugger] Fix MDBGPROT_CMD_TYPE_ELEMENT_TYPE behavior
 (#85679)

* Fix MDBGPROT_CMD_TYPE_ELEMENT_TYPE

* fix tabs

* Remove generation of dbgshim.
Address @lambdageek comment.
---
 src/mono/CMakeLists.txt                  | 1 -
 src/mono/mono.proj                       | 3 ---
 src/mono/mono/component/debugger-agent.c | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt
index dde6655..bc65886 100644
--- a/src/mono/CMakeLists.txt
+++ b/src/mono/CMakeLists.txt
@@ -943,7 +943,6 @@ add_subdirectory("${CLR_SRC_NATIVE_DIR}/public" public_apis)
 add_subdirectory(mono)
 if (ENABLE_MSCORDBI AND NOT TARGET_ARCH STREQUAL "arm64"  AND NOT CMAKE_CROSSCOMPILING AND NOT TARGET_IOS AND NOT TARGET_ANDROID AND NOT TARGET_BROWSER AND NOT TARGET_WASI AND NOT HOST_MACCAT)
   add_subdirectory(dlls/mscordbi)
-  add_subdirectory(dlls/dbgshim)
 endif()
 
 configure_file(cmake/config.h.in config.h)
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 8765984..de64d7d 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -1031,9 +1031,6 @@
       <_MonoRuntimeArtifacts Condition="'$(TargetsBrowser)' == 'true' and '$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(MonoObjDir)out\lib\libmono-wasm-eh-wasm.a">
         <Destination>$(RuntimeBinDir)libmono-wasm-eh-wasm.a</Destination>
       </_MonoRuntimeArtifacts>
-      <_MonoICorDebugArtifacts Condition="'$(MonoMsCorDbi)' == 'true'" Include="$(MonoObjDir)out\lib\$(LibPrefix)dbgshim$(LibSuffix)">
-        <Destination>$(RuntimeBinDir)$(LibPrefix)dbgshim$(LibSuffix)</Destination>
-      </_MonoICorDebugArtifacts>
       <_MonoICorDebugArtifacts Condition="'$(MonoMsCorDbi)' == 'true'" Include="$(MonoObjDir)out\lib\$(LibPrefix)mscordbi$(LibSuffix)">
         <Destination>$(RuntimeBinDir)$(LibPrefix)mscordbi$(LibSuffix)</Destination>
       </_MonoICorDebugArtifacts>
diff --git a/src/mono/mono/component/debugger-agent.c b/src/mono/mono/component/debugger-agent.c
index fe0cd66..66404ac 100644
--- a/src/mono/mono/component/debugger-agent.c
+++ b/src/mono/mono/component/debugger-agent.c
@@ -8847,6 +8847,7 @@ set_value:
 	case MDBGPROT_CMD_TYPE_ELEMENT_TYPE: 
 	{
 		buffer_add_int (buf, m_class_get_byval_arg (klass)->type);
+		buffer_add_byte (buf, MONO_TYPE_ISSTRUCT (m_class_get_byval_arg (klass)));
 		break;
 	}
 	case MDBGPROT_CMD_TYPE_RANK: 
-- 
2.7.4