diff options
author | Zoltan Varga <vargaz@gmail.com> | 2017-06-17 08:32:34 +0300 |
---|---|---|
committer | Zoltan Varga <vargaz@gmail.com> | 2017-06-17 08:32:34 +0300 |
commit | d421ee95b03dd2ffee3dcea9ef24406a5d064684 (patch) | |
tree | d7549b693d481ec2a55ddd56d6a5e5838eb540fd /mcs/class/Mono.Debugger.Soft | |
parent | 6fc58f529b10f664c71bb301ed9d3524ed4e4f87 (diff) |
[sdb] Fix invokes to string ctors. Fixes #57197.
Diffstat (limited to 'mcs/class/Mono.Debugger.Soft')
-rw-r--r-- | mcs/class/Mono.Debugger.Soft/Test/dtest.cs | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs index 7a16e5dcb83..671293df185 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs @@ -2640,19 +2640,6 @@ public class DebuggerTests v = this_obj.InvokeMethod (e.Thread, m, new Value [] { s }); AssertValue (2, v); - return; - - // string constructor - var stringType = vm.RootDomain.Corlib.GetType ("System.String"); - var stringConstructor = stringType.GetMethods ().Single (c=> - c.Name == ".ctor" && - c.GetParameters ().Length == 2 && - c.GetParameters ()[0].ParameterType.Name == "Char" && - c.GetParameters ()[1].ParameterType.Name == "Int32"); - var str = stringType.NewInstance (e.Thread, stringConstructor, new Value [] { vm.CreateValue ('a'), vm.CreateValue (3)}); - - AssertValue("aaa", str); - // pass primitive m = t.GetMethod ("invoke_pass_primitive"); Value[] args = new Value [] { @@ -2746,6 +2733,17 @@ public class DebuggerTests task = t.InvokeMethodAsync (e.Thread, m, new Value [] { vm.RootDomain.CreateString ("ABC") }); AssertValue ("ABC", task.Result); + // string constructor + var stringType = vm.RootDomain.Corlib.GetType ("System.String"); + var stringConstructor = stringType.GetMethods ().Single (c=> + c.Name == ".ctor" && + c.GetParameters ().Length == 2 && + c.GetParameters ()[0].ParameterType.Name == "Char" && + c.GetParameters ()[1].ParameterType.Name == "Int32"); + var str = stringType.NewInstance (e.Thread, stringConstructor, new Value [] { vm.CreateValue ('a'), vm.CreateValue (3)}); + + AssertValue("aaa", str); + // Argument checking // null thread |