Skip to content

[wasm][debugger] Avoid infinite loop when we have a boxed new object #42059

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
radical merged 2 commits into from
Sep 14, 2020
Merged

[wasm][debugger] Avoid infinite loop when we have a boxed new object #42059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b01f49
[wasm][debugger] Avoid infinite loop when we have a boxed `new object`
radical Sep 8, 2020
35f70e0
[wasm][debugger] Handle valuetypes boxed in classes that are not
radical Sep 10, 2020
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
10 changes: 10 additions & 0 deletions src/mono/mono/mini/mini-wasm-debugger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,10 @@ describe_value(MonoType * type, gpointer addr, int gpflags)
}

type = m_class_get_byval_arg (klass);
if (type->type == MONO_TYPE_OBJECT) {
mono_wasm_add_obj_var ("object", "object", get_object_id (obj));
break;
}

// Boxed valuetype
if (m_class_is_valuetype (klass))
Expand Down Expand Up @@ -965,6 +969,12 @@ describe_value(MonoType * type, gpointer addr, int gpflags)
MonoObject *obj = *(MonoObject**)addr;
MonoClass *klass = type->data.klass;

if (m_class_is_valuetype (mono_object_class (obj))) {
addr = mono_object_unbox_internal (obj);
type = m_class_get_byval_arg (mono_object_class (obj));
goto handle_vtype;
}

char *class_name = mono_type_full_name (type);
int obj_id = get_object_id (obj);

Expand Down
51 changes: 51 additions & 0 deletions src/mono/wasm/debugger/DebuggerTestSuite/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,57 @@ await CheckProps(o_ia_props, new[]
}, nameof(o_ia_props));
});

[Theory]
[InlineData("BoxedTypeObjectTest", false)]
[InlineData("BoxedTypeObjectTestAsync", true)]
public async Task InspectBoxedTypeObject(string method_name, bool is_async) => await CheckInspectLocalsAtBreakpointSite(
"DebuggerTest",
method_name,
9,
is_async ? "MoveNext" : method_name,
$"window.setTimeout(function() {{ invoke_static_method_async('[debugger-test] DebuggerTest:{method_name}'); }}, 1);",
wait_for_event_fn: async (pause_location) =>
{
var locals = await GetProperties(pause_location["callFrames"][0]["callFrameId"].Value<string>());
var dt = new DateTime(2310, 1, 2, 3, 4, 5);
await CheckProps(locals, new
{
i = TNumber(5),
o0 = TNumber(5),
o1 = TNumber(5),
o2 = TNumber(5),
o3 = TNumber(5),

oo = TObject("object"),
oo0 = TObject("object"),
}, "locals");
});

[Theory]
[InlineData("BoxedAsClass", false)]
[InlineData("BoxedAsClassAsync", true)]
public async Task InspectBoxedAsClassLocals(string method_name, bool is_async) => await CheckInspectLocalsAtBreakpointSite(
"DebuggerTest",
method_name,
6,
is_async ? "MoveNext" : method_name,
$"window.setTimeout(function() {{ invoke_static_method_async('[debugger-test] DebuggerTest:{method_name}'); }}, 1);",
wait_for_event_fn: async (pause_location) =>
{
var locals = await GetProperties(pause_location["callFrames"][0]["callFrameId"].Value<string>());
var dt = new DateTime(2310, 1, 2, 3, 4, 5);
Console.WriteLine (locals);

await CheckProps(locals, new
{
vt_dt = TDateTime(new DateTime(4819, 5, 6, 7, 8, 9)),
vt_gs = TValueType("Math.GenericStruct<string>"),
e = TEnum("System.IO.FileMode", "0"),
ee = TEnum("System.IO.FileMode", "Append")
}, "locals");
});


[Theory]
[InlineData(false)]
[InlineData(true)]
Expand Down
47 changes: 47 additions & 0 deletions src/mono/wasm/debugger/tests/debugger-test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,53 @@ public static async Task BoxingTestAsync()
Console.WriteLine ($"break here");
await Task.CompletedTask;
}

public static void BoxedTypeObjectTest()
{
int i = 5;
object o0 = i;
object o1 = o0;
object o2 = o1;
object o3 = o2;

object oo = new object();
object oo0 = oo;
Console.WriteLine ($"break here");
}
public static async Task BoxedTypeObjectTestAsync()
{
int i = 5;
object o0 = i;
object o1 = o0;
object o2 = o1;
object o3 = o2;

object oo = new object();
object oo0 = oo;
Console.WriteLine ($"break here");
await Task.CompletedTask;
}

public static void BoxedAsClass()
{
ValueType vt_dt = new DateTime(4819, 5, 6, 7, 8, 9);
ValueType vt_gs = new Math.GenericStruct<string> { StringField = "vt_gs#StringField" };
Enum e = new System.IO.FileMode();
Enum ee = System.IO.FileMode.Append;

Console.WriteLine ($"break here");
}

public static async Task BoxedAsClassAsync()
{
ValueType vt_dt = new DateTime(4819, 5, 6, 7, 8, 9);
ValueType vt_gs = new Math.GenericStruct<string> { StringField = "vt_gs#StringField" };
Enum e = new System.IO.FileMode();
Enum ee = System.IO.FileMode.Append;

Console.WriteLine ($"break here");
await Task.CompletedTask;
}
}

public class MulticastDelegateTestClass
Expand Down