[debugger][android] It was not initialising seq_points on MonoCompile on Android, so when was compiling dynamic methods, seq_points wasn't created and we got the assert when try to single step.

thaystg · marek-safar · commit 7a1f63fde683 · 2019-09-06T23:28:08.000+02:00
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
@@ -4929,12 +4929,8 @@ ss_create_init_args (SingleStepReq *ss_req, SingleStepArgs *args)
 				found_sp = mono_find_prev_seq_point_for_native_offset (frame->de.domain, frame->de.method, frame->de.native_offset, &info, &args->sp);
 				if (!found_sp)
 					no_seq_points_found (frame->de.method, frame->de.native_offset);
-#if !defined(HOST_ANDROID) && !defined(TARGET_ANDROID)					
 				g_assert (found_sp);				
-#else
-				if (found_sp) //it will not find the sp if it is a method of class Android.Runtime.DynamicMethodNameCounter
-#endif				
-					method = frame->de.method;
+				method = frame->de.method;
 			}
 		}
 	}
diff --git a/mono/mini/mini.c b/mono/mini/mini.c
@@ -3148,13 +3148,6 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
 	cfg->interp = (flags & JIT_FLAG_INTERP) != 0;
 	cfg->backend = current_backend;
 
-#ifdef HOST_ANDROID
-	if (cfg->method->wrapper_type != MONO_WRAPPER_NONE) {
-		/* FIXME: Why is this needed */
-		cfg->gen_seq_points = FALSE;
-		cfg->gen_sdb_seq_points = FALSE;
-	}
-#endif
 	if (cfg->method->wrapper_type == MONO_WRAPPER_ALLOC) {
 		/* We can't have seq points inside gc critical regions */
 		cfg->gen_seq_points = FALSE;

Original file line number	Diff line number	Diff line change
`@@ -4929,12 +4929,8 @@ ss_create_init_args (SingleStepReq ss_req, SingleStepArgs args)`
`4929`	`4929`	`found_sp = mono_find_prev_seq_point_for_native_offset (frame->de.domain, frame->de.method, frame->de.native_offset, &info, &args->sp);`
`4930`	`4930`	`if (!found_sp)`
`4931`	`4931`	`no_seq_points_found (frame->de.method, frame->de.native_offset);`
`4932`		`-#if !defined(HOST_ANDROID) && !defined(TARGET_ANDROID)`
`4933`	`4932`	`g_assert (found_sp);`
`4934`		`-#else`
`4935`		`- if (found_sp) //it will not find the sp if it is a method of class Android.Runtime.DynamicMethodNameCounter`
`4936`		`-#endif`
`4937`		`- method = frame->de.method;`
	`4933`	`+ method = frame->de.method;`
`4938`	`4934`	`}`
`4939`	`4935`	`}`
`4940`	`4936`	`}`