Merge pull request #1115 from Unity-Technologies/unity-master-sync-il…

…2cpp Sync IL2CPP changes up to aebcd0f844270d5f407ec3d22f20a066d7028d36
Unity-Technologies · Jan 4, 2019 · 14c1736 · 14c1736
2 parents 9696779 + 46ed83e
commit 14c1736
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 607 deletions.
diff --git a/mono/metadata/il2cpp-compat-metadata.h b/mono/metadata/il2cpp-compat-metadata.h
@@ -25,6 +25,7 @@ SgenDescriptor il2cpp_mono_gc_make_root_descr_all_refs(int numbits);
 MonoGCDescriptor il2cpp_mono_gc_make_vector_descr (void);
 void* il2cpp_mono_gc_alloc_fixed (size_t size, void* descr, MonoGCRootSource source, void *key, const char *msg);
 gboolean il2cpp_mono_gc_is_moving();
+void il2cpp_mono_gc_deregister_root(char* addr);
 
 typedef void* (*MonoGCLockedCallbackFunc) (void *data);
 void* il2cpp_mono_gc_invoke_with_gc_lock (MonoGCLockedCallbackFunc func, void *data);

diff --git a/mono/metadata/metadata-internals.h b/mono/metadata/metadata-internals.h
@@ -195,6 +195,9 @@ struct _MonoImage {
 	/* If the raw data was allocated from a source such as mmap, the allocator may store resource tracking information here. */
 	void *raw_data_handle;
 	char *raw_data;
+#ifdef IL2CPP_ON_MONO
+	void* il2cpp_codegen_handle;
+#endif
 	guint32 raw_data_len;
 	guint8 raw_buffer_used    : 1;
 	guint8 raw_data_allocated : 1;

diff --git a/mono/metadata/mono-hash.c b/mono/metadata/mono-hash.c
@@ -37,6 +37,8 @@
 #include <mono/utils/mono-threads-coop.h>
 #include <mono/utils/unlocked.h>
 
+void il2cpp_mono_gc_wbarrier_generic_store (void* ptr, MonoObject* value);
+
 gint32 mono_g_hash_table_max_chain_length;
 
 struct _MonoGHashTable {