Merge pull request #869 from Unity-Technologies/unity-master-sync-il2cpp

Sync debugger changes from IL2CPP

Author: joncham

mono/metadata/il2cpp-compat-metadata.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef IL2CPP_MONO_DEBUGGER
+#ifdef RUNTIME_IL2CPP
 
 #include <mono/sgen/sgen-conf.h>
 #include <mono/metadata/mono-gc.h>
@@ -33,4 +33,4 @@ void* il2cpp_mono_gc_invoke_with_gc_lock (MonoGCLockedCallbackFunc func, void *d
 int il2cpp_mono_gc_pthread_create (pthread_t *new_thread, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg);
 #endif
 
-#endif
+#endif

mono/mini/debugger-agent.c

@@ -9134,6 +9134,21 @@ event_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
 				return err;
 			}
 
+#if RUNTIME_IL2CPP
+            {
+                DebuggerTlsData* tls;
+                mono_loader_lock();
+                tls = (DebuggerTlsData *)mono_g_hash_table_lookup(thread_to_tls, THREAD_TO_INTERNAL(step_thread));
+                mono_loader_unlock();
+
+                if (tls->il2cpp_context.frameCount == 1 && depth == STEP_DEPTH_OUT)
+                {
+                    g_free(req);
+                    return ERR_NONE;
+                }
+            }
+#endif
+
 			err = ss_create (THREAD_TO_INTERNAL (step_thread), size, depth, filter, req);
 			if (err != ERR_NONE) {
 				g_free (req);

mono/mini/il2cpp-stubs.cpp

@@ -1505,7 +1505,11 @@ char* il2cpp_assembly_get_full_name(MonoAssembly *assembly)
 
 const MonoMethod* il2cpp_get_seq_point_method(Il2CppSequencePoint *seqPoint)
 {
+#if IL2CPP_MONO_DEBUGGER
     return il2cpp::utils::Debugger::GetSequencePointMethod(seqPoint);
+#else
+    return NULL;
+#endif
 }
 
 const MonoClass* il2cpp_get_class_from_index(int index)