Sync changes from IL2CPP 85698322c225ff1be2bc71c65a00b64d67d71a24

joncham · joncham · commit b6daf2015bb9 · 2018-03-12T10:31:01.000-04:00
Added a building test for building with the debugger code generation
enabled but the debugger turned "off" via the IL2CPP_MONO_DEBUGGER
preprocessor define.
diff --git a/mono/metadata/il2cpp-compat-metadata.h b/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
diff --git a/mono/mini/il2cpp-stubs.cpp b/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)

Original file line number	Diff line number	Diff line change
`@@ -1505,7 +1505,11 @@ char* il2cpp_assembly_get_full_name(MonoAssembly *assembly)`
`1505`	`1505`
`1506`	`1506`	`const MonoMethod* il2cpp_get_seq_point_method(Il2CppSequencePoint *seqPoint)`
`1507`	`1507`	`{`
	`1508`	`+#if IL2CPP_MONO_DEBUGGER`
`1508`	`1509`	`return il2cpp::utils::Debugger::GetSequencePointMethod(seqPoint);`
	`1510`	`+#else`
	`1511`	`+ return NULL;`
	`1512`	`+#endif`
`1509`	`1513`	`}`
`1510`	`1514`
`1511`	`1515`	`const MonoClass* il2cpp_get_class_from_index(int index)`