Merge pull request #847 from Unity-Technologies/il2cpp-debbuger-sync

joshpeterson · web-flow · commit f0fe1120459f · 2018-02-13T10:40:29.000-05:00
Synchronize changes debugger from the IL2CPP repo
diff --git a/mono/mini/il2cpp-stubs.cpp b/mono/mini/il2cpp-stubs.cpp
@@ -763,7 +763,14 @@ void il2cpp_mono_thread_internal_reset_abort(MonoInternalThread* thread)
 
 gunichar2* il2cpp_mono_thread_get_name(MonoInternalThread* this_obj, guint32* name_len)
 {
-	return NULL;
+	std::string name = il2cpp::vm::Thread::GetName((Il2CppInternalThread*)this_obj);
+
+	if (name_len != NULL)
+		*name_len = name.size();
+
+	if (name.empty())
+		return NULL;
+	return g_utf8_to_utf16(name.c_str(), name.size(), NULL, NULL, NULL);
 }
 
 void il2cpp_mono_thread_set_name_internal(MonoInternalThread* this_obj, MonoString* name, gboolean permanent, gboolean reset, MonoError* error)

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,14 @@ void il2cpp_mono_thread_internal_reset_abort(MonoInternalThread* thread)`
`763`	`763`
`764`	`764`	`gunichar2* il2cpp_mono_thread_get_name(MonoInternalThread* this_obj, guint32* name_len)`
`765`	`765`	`{`
`766`		`- return NULL;`
	`766`	`+ std::string name = il2cpp::vm::Thread::GetName((Il2CppInternalThread*)this_obj);`
	`767`	`+`
	`768`	`+ if (name_len != NULL)`
	`769`	`+ *name_len = name.size();`
	`770`	`+`
	`771`	`+ if (name.empty())`
	`772`	`+ return NULL;`
	`773`	`+ return g_utf8_to_utf16(name.c_str(), name.size(), NULL, NULL, NULL);`
`767`	`774`	`}`
`768`	`775`
`769`	`776`	`void il2cpp_mono_thread_set_name_internal(MonoInternalThread* this_obj, MonoString* name, gboolean permanent, gboolean reset, MonoError* error)`