From: Rodrigo Kumpera Date: Thu, 28 Sep 2017 17:01:11 +0000 (-0700) Subject: [runtime] Fix icall signature and change comment to fixme. X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=24e97e5c52d88408b1e323fe0b2d3a4b99f35302 [runtime] Fix icall signature and change comment to fixme. --- diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h index 2e8408bcac0..26b11d77371 100644 --- a/mono/metadata/object-internals.h +++ b/mono/metadata/object-internals.h @@ -1927,7 +1927,7 @@ void ves_icall_AssemblyBuilder_basic_init (MonoReflectionAssemblyBuilder *assemblyb); void -ves_icall_AssemblyBuilder_UpdateNativeCustomAttributes (MonoReflectionAssemblyBuilderHandle assemblyb); +ves_icall_AssemblyBuilder_UpdateNativeCustomAttributes (MonoReflectionAssemblyBuilderHandle assemblyb, MonoError *error); MonoArray* ves_icall_CustomAttributeBuilder_GetBlob (MonoReflectionAssembly *assembly, MonoObject *ctor, MonoArray *ctorArgs, MonoArray *properties, MonoArray *propValues, MonoArray *fields, MonoArray* fieldValues); diff --git a/mono/metadata/sre.c b/mono/metadata/sre.c index 6fa1353b91f..3bcba2bf0cf 100644 --- a/mono/metadata/sre.c +++ b/mono/metadata/sre.c @@ -376,7 +376,7 @@ mono_save_custom_attrs (MonoImage *image, void *obj, MonoArray *cattrs) } #else -//For some WTF reason, users of this function are DISABLE_REFLECTION_EMIT +//FIXME some code compiled under DISABLE_REFLECTION_EMIT depends on this function, we should be more aggressively disabling things static void mono_save_custom_attrs (MonoImage *image, void *obj, MonoArray *cattrs) { @@ -4384,7 +4384,7 @@ ves_icall_AssemblyBuilder_basic_init (MonoReflectionAssemblyBuilder *assemblyb) } void -ves_icall_AssemblyBuilder_UpdateNativeCustomAttributes (MonoReflectionAssemblyBuilderHandle assemblyb) +ves_icall_AssemblyBuilder_UpdateNativeCustomAttributes (MonoReflectionAssemblyBuilderHandle assemblyb, MonoError *error) { MonoArrayHandle cattrs = MONO_HANDLE_NEW_GET (MonoArray, assemblyb, cattrs);