Skip to content

[mono][debugger]Adding more information about the array type #89304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaystg merged 5 commits into from
Aug 14, 2023
Merged

[mono][debugger]Adding more information about the array type #89304

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e96d363
Adding more information about the array type.
thaystg Jul 21, 2023
f03b0ad
Adding more changes
thaystg Jul 21, 2023
eeb0923
Update src/mono/mono/component/debugger-agent.c
lewing Jul 21, 2023
0966d10
Merge branch 'dotnet:main' into thays_debug_changes
thaystg Aug 14, 2023
9fe406f
Only add this info for icordbg.
thaystg Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions src/mono/mono/component/debugger-agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8709,11 +8709,6 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
goto invalid_object;
}
buffer_add_objid (buf, o);
if (CHECK_ICORDBG (TRUE))
{
MonoType *object_type = m_class_get_byval_arg (m_class_get_element_class (klass));
buffer_add_value (buf, object_type, o, domain);
}
break;
}
case CMD_TYPE_GET_SOURCE_FILES:
Expand Down Expand Up @@ -8855,10 +8850,36 @@ type_commands_internal (int command, MonoClass *klass, MonoDomain *domain, guint
}
case CMD_TYPE_CREATE_INSTANCE: {
MonoObject *obj;

obj = mono_object_new_checked (klass, error);
mono_error_assert_ok (error);
buffer_add_objid (buf, obj);
if (CHECK_ICORDBG (TRUE))
{
buffer_add_byte(buf, m_class_is_valuetype (klass));
if (m_class_is_valuetype (klass))
{
int nfields = 0;
gpointer iter = NULL;
while ((f = mono_class_get_fields_internal (klass, &iter))) {
if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
continue;
if (mono_field_is_deleted (f))
continue;
nfields ++;
}
buffer_add_int (buf, nfields);

iter = NULL;
while ((f = mono_class_get_fields_internal (klass, &iter))) {
if (f->type->attrs & FIELD_ATTRIBUTE_STATIC)
continue;
if (mono_field_is_deleted (f))
continue;
buffer_add_int (buf, mono_class_get_field_token (f));
buffer_add_byte (buf, f->type->type);
}
}
}
break;
}
case CMD_TYPE_GET_VALUE_SIZE: {
Expand Down Expand Up @@ -10113,10 +10134,15 @@ array_commands (int command, guint8 *p, guint8 *end, Buffer *buf)

switch (command) {
case CMD_ARRAY_REF_GET_TYPE: {
buffer_add_byte(buf, m_class_get_byval_arg (m_class_get_element_class (arr->obj.vtable->klass))->type);
MonoTypeEnum type = m_class_get_byval_arg (m_class_get_element_class (arr->obj.vtable->klass))->type;
buffer_add_byte(buf, type);
buffer_add_int (buf, m_class_get_rank (arr->obj.vtable->klass));
if (m_class_get_byval_arg (m_class_get_element_class (arr->obj.vtable->klass))->type == MONO_TYPE_CLASS)
if (type == MONO_TYPE_CLASS || type == MONO_TYPE_GENERICINST || type == MONO_TYPE_OBJECT)
{
buffer_add_typeid (buf, arr->obj.vtable->domain, m_class_get_element_class (arr->obj.vtable->klass));
if (CHECK_ICORDBG (TRUE))
buffer_add_byte (buf, MONO_TYPE_ISSTRUCT (m_class_get_byval_arg (m_class_get_element_class (arr->obj.vtable->klass))));
}
}
break;
case CMD_ARRAY_REF_GET_LENGTH:
Expand Down