Skip to content

Commit

Permalink
2008-09-06 Zoltan Varga <vargaz@gmail.com>
Browse files Browse the repository at this point in the history
	* reflection.c (_mono_reflection_get_type_from_info): Revert the last change
	(r111766) as it is not needed after the no-exec changes.

svn path=/branches/mono-2-0/mono/; revision=112404
  • Loading branch information
vargaz committed Sep 5, 2008
1 parent 73e67e1 commit 808a676
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 7 additions & 1 deletion mono/metadata/ChangeLog
@@ -1,4 +1,10 @@
2008-09-03 Rodrigo Kumpera <rkumpera@novell.com>+
2008-09-06 Zoltan Varga <vargaz@gmail.com>

* reflection.c (_mono_reflection_get_type_from_info): Revert the last change
(r111766) as it is not needed after the no-exec changes.

2008-09-03 Rodrigo Kumpera <rkumpera@novell.com>

* verify.c (verify_type_compatibility_full): Revert change
to allow converting a native int to unmanaged pointer be verifiable
under non-strict mode.
Expand Down
6 changes: 0 additions & 6 deletions mono/metadata/reflection.c
Expand Up @@ -6742,12 +6742,6 @@ _mono_reflection_get_type_from_info (MonoTypeNameParse *info, MonoImage *image,

if (info->assembly.name) {
MonoAssembly *assembly = mono_assembly_loaded (&info->assembly);
if (!assembly && image && image->assembly && mono_assembly_names_equal (&info->assembly, &image->assembly->aname))
/*
* This could happen in the AOT compiler case when the search hook is not
* installed.
*/
assembly = image->assembly;
if (!assembly) {
/* then we must load the assembly ourselve - see #60439 */
assembly = mono_assembly_load (&info->assembly, NULL, NULL);
Expand Down

0 comments on commit 808a676

Please sign in to comment.