Merge pull request #1243 from Unity-Technologies/unity-master-fix-1118285

joncham · web-flow · commit 0c2602dbe60f · 2019-12-04T12:17:32.000-05:00
Reintroduce fix for case 1118285.
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
@@ -3904,7 +3904,7 @@ create_event_list (EventKind event, GPtrArray *reqs, MonoJitInfo *ji, DebuggerEv
 							break;
 					}
 #else
-					while ((method = mono_class_get_methods (ei->klass, &iter))) {
+					while (!found && (method = mono_class_get_methods (ei->klass, &iter))) {
 						MonoDebugMethodInfo *minfo = mono_debug_lookup_method (method);
 
 						if (minfo) {

Original file line number	Diff line number	Diff line change
`@@ -3904,7 +3904,7 @@ create_event_list (EventKind event, GPtrArray reqs, MonoJitInfo ji, DebuggerEv`
`3904`	`3904`	`break;`
`3905`	`3905`	`}`
`3906`	`3906`	`#else`
`3907`		`- while ((method = mono_class_get_methods (ei->klass, &iter))) {`
	`3907`	`+ while (!found && (method = mono_class_get_methods (ei->klass, &iter))) {`
`3908`	`3908`	`MonoDebugMethodInfo *minfo = mono_debug_lookup_method (method);`
`3909`	`3909`
`3910`	`3910`	`if (minfo) {`