From: Thays Grazia <thaystg@gmail.com>
Date: Fri, 6 Sep 2019 01:16:50 +0000 (-0300)
Subject: [debugger][android] It was not initialising seq_points on MonoCompile on Android... 
X-Git-Tag: submit/tizen/20210909.063632~10331^2~5^2~551
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f1a63d544a312220cc4517989ca4f45a54aec6b;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

[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. (mono/mono#16691)



Commit migrated from https://github.com/mono/mono/commit/c23a8906f3e0d8572a6c28b06e8a85f3d3c0ea8c
---

diff --git a/src/mono/mono/mini/debugger-agent.c b/src/mono/mono/mini/debugger-agent.c
index 6585328..0f1405a 100644
--- a/src/mono/mono/mini/debugger-agent.c
+++ b/src/mono/mono/mini/debugger-agent.c
@@ -4967,12 +4967,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/src/mono/mono/mini/mini.c b/src/mono/mono/mini/mini.c
index a296d9d..a0042ab 100644
--- a/src/mono/mono/mini/mini.c
+++ b/src/mono/mono/mini/mini.c
@@ -3164,13 +3164,6 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
 	cfg->use_current_cpu = (flags & JIT_FLAG_USE_CURRENT_CPU) != 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;