mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.4.1

Browse Source 
Former-commit-id: d8eb832a9a4b58a238f2e069a0b68c70082f8790
This commit is contained in:
Xamarin Public Jenkins
2015-08-25 18:44:33 -04:00
parent c7df8a8f93
commit 363056e66e
34 changed files with 115 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mono/metadata/image.c
View File

@@ -2007,6 +2007,7 @@ mono_image_load_file_for_image (MonoImage *image, int fileidx)
mono_image_unlock (image);
return image->files [fileidx - 1];
}
mono_image_unlock (image);
fname_id = mono_metadata_decode_row_col (t, fileidx - 1, MONO_FILE_NAME);
fname = mono_metadata_string_heap (image, fname_id);
@@ -2020,7 +2021,7 @@ mono_image_load_file_for_image (MonoImage *image, int fileidx)
if (image->files && image->files [fileidx - 1]) {
MonoImage *old = res;
res = image->files [fileidx - 1];
mono_loader_unlock ();
mono_image_unlock (image);
mono_image_close (old);
} else {
int i;
@@ -2034,7 +2035,7 @@ mono_image_load_file_for_image (MonoImage *image, int fileidx)
if (!image->files)
image->files = g_new0 (MonoImage*, t->rows);
image->files [fileidx - 1] = res;
mono_loader_unlock ();
mono_image_unlock (image);
/* vtable fixup can't happen with the image lock held */
#ifdef HOST_WIN32
if (res->is_module_handle)

2
mono/mini/Makefile.am
View File

@@ -759,7 +759,7 @@ EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.0.3.20/d6946b4\"" > version.h
echo "#define FULL_VERSION \"Stable 4.0.4.1/5ab4c0d\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

2
mono/mini/Makefile.am.in
View File

@@ -759,7 +759,7 @@ EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \
Makefile.am.in
version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.0.3.20/d6946b4\"" > version.h
echo "#define FULL_VERSION \"Stable 4.0.4.1/5ab4c0d\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@@ -1 +1 @@
7ac03b3cefbbfa9d11d67b9d04a42870367a4eff
8959e291e0e5f26397d9b96d257b52820f9acee0

10
mono/mini/seq-points.c
View File

@@ -398,14 +398,20 @@ MonoSeqPointInfo*
get_seq_points (MonoDomain *domain, MonoMethod *method)
{
MonoSeqPointInfo *seq_points;
MonoMethod *declaring_generic_method = NULL, *shared_method = NULL;
if (method->is_inflated) {
declaring_generic_method = mono_method_get_declaring_generic_method (method);
shared_method = mini_get_shared_method (method);
}
mono_domain_lock (domain);
seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, method);
if (!seq_points && method->is_inflated) {
/* generic sharing + aot */
seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, mono_method_get_declaring_generic_method (method));
seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, declaring_generic_method);
if (!seq_points)
seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, mini_get_shared_method (method));
seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, shared_method);
}
mono_domain_unlock (domain);

2
mono/mini/version.h
View File

@@ -1 +1 @@
#define FULL_VERSION "Stable 4.0.3.20/d6946b4"
#define FULL_VERSION "Stable 4.0.4.1/5ab4c0d"