Merge pull request #770 from Unity-Technologies/unity-master-staging

Mono Bleeding Edge fixes for Trunk
case 947208 - partial fix
case 973494 - Expose mono_object_is_alive

Lots of IL2CPP debugger work.

Author: joncham

.editorconfig

@@ -0,0 +1,28 @@
+# see http://editorconfig.org/ for docs on this file
+
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = false
+insert_final_newline = false
+indent_style = tab
+indent_size = 4
+
+# this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
+# the settings are meant to closely match what VS does to minimize unnecessary diffs. this duplicates some settings in *
+# but let's be explicit here to be safe (in case someone wants to copy-paste this out to another .editorconfig).
+[*.{vcxproj,vcxproj.filters,csproj,props,targets}]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8-bom
+trim_trailing_whitespace = true
+insert_final_newline = false
+[*.{sln,sln.template}]
+indent_style = tab
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false

mcs/class/System/ReferenceSources/SecureStringHelper.cs

@@ -14,7 +14,18 @@ internal static string CreateString(SecureString secureString)
 
                 if (secureString == null || secureString.Length == 0)
                     return String.Empty;
-
+#if MONO
+                try
+                {
+                    bstr = Marshal.SecureStringToGlobalAllocUnicode(secureString);
+                    plainString = Marshal.PtrToStringUni(bstr);
+                }
+                finally
+                {
+                    if (bstr != IntPtr.Zero)
+                        Marshal.ZeroFreeGlobalAllocUnicode(bstr);
+                }
+#else
                 try
                 {
                     bstr = Marshal.SecureStringToBSTR(secureString);
@@ -25,6 +36,7 @@ internal static string CreateString(SecureString secureString)
                     if (bstr != IntPtr.Zero)
                         Marshal.ZeroFreeBSTR(bstr);
                 }
+#endif
                 return plainString;
             }
 

mono/metadata/gc-internals.h

@@ -90,7 +90,7 @@ extern void mono_gc_set_stack_end (void *stack_end);
 /* only valid after the RECLAIM_START GC event and before RECLAIM_END
  * Not exported in public headers, but can be linked to (unsupported).
  */
-gboolean mono_object_is_alive (MonoObject* obj);
+MONO_API gboolean mono_object_is_alive (MonoObject* obj);
 gboolean mono_gc_is_finalizer_thread (MonoThread *thread);
 
 void mono_gchandle_set_target (guint32 gchandle, MonoObject *obj);

mono/metadata/unity-utils.c

@@ -1129,8 +1129,6 @@ mono_unity_alloc(gsize size)
 MONO_API void
 mono_unity_thread_fast_attach (MonoDomain *domain)
 {
-	g_assert_not_reached ();
-#if 1
 	MonoInternalThread *thread;
 
 	g_assert (domain);
@@ -1143,14 +1141,11 @@ mono_unity_thread_fast_attach (MonoDomain *domain)
 	g_assert (mono_domain_set (domain, FALSE));
 
 	//mono_profiler_thread_fast_attach (thread->tid);
-#endif
 }
 
 MONO_API void
 mono_unity_thread_fast_detach ()
 {
-	g_assert_not_reached ();
-#if 1
 	MonoInternalThread *thread;
 	MonoDomain *current_domain;
 
@@ -1168,7 +1163,6 @@ mono_unity_thread_fast_detach ()
 	// the thread to stay alive and keep running while the domain can be unloaded
 	g_assert (mono_domain_set (mono_get_root_domain (), FALSE));
 	mono_thread_pop_appdomain_ref ();
-#endif
 }
 
 // hack, FIXME jon