diff options
| author | Jay Krell <jaykrell@microsoft.com> | 2019-11-21 22:15:29 +0300 |
|---|---|---|
| committer | Aleksey Kliger (λgeek) <alklig@microsoft.com> | 2019-11-21 22:15:29 +0300 |
| commit | dadc3d3117535ec44b887b8390181beda7b75b31 (patch) | |
| tree | 9f20b452619ad42f6aad4f1f93fe2d05f1d32193 | |
| parent | 9e00330af303bdc2b5f4ea2302e8bbcdfdc45524 (diff) | |
Remove handles/MonoError from Mono.RuntimeGPtrArrayHandle. (#17806)
| -rw-r--r-- | mono/metadata/icall-decl.h | 1 | ||||
| -rw-r--r-- | mono/metadata/icall-def-netcore.h | 2 | ||||
| -rw-r--r-- | mono/metadata/icall-def.h | 2 | ||||
| -rw-r--r-- | mono/metadata/icall.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/mono/metadata/icall-decl.h b/mono/metadata/icall-decl.h index 0f973642316..42a76dfd054 100644 --- a/mono/metadata/icall-decl.h +++ b/mono/metadata/icall-decl.h @@ -226,5 +226,6 @@ ICALL_EXPORT MonoBoolean ves_icall_System_Array_CanChangePrimitive (MonoReflecti ICALL_EXPORT MonoBoolean ves_icall_System_Diagnostics_Debugger_IsAttached_internal (void); ICALL_EXPORT MonoBoolean ves_icall_System_Diagnostics_Debugger_IsLogging (void); ICALL_EXPORT void ves_icall_System_Diagnostics_Debugger_Log (int level, MonoString *volatile* category, MonoString *volatile* message); +ICALL_EXPORT void ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree (GPtrArray *ptr_array); #endif // __MONO_METADATA_ICALL_H__ diff --git a/mono/metadata/icall-def-netcore.h b/mono/metadata/icall-def-netcore.h index 16feb7f1b08..14253fd22fe 100644 --- a/mono/metadata/icall-def-netcore.h +++ b/mono/metadata/icall-def-netcore.h @@ -21,7 +21,7 @@ ICALL_TYPE(RTCLASS, "Mono.RuntimeClassHandle", RTCLASS_1) HANDLES(RTCLASS_1, "GetTypeFromClass", ves_icall_Mono_RuntimeClassHandle_GetTypeFromClass, MonoType_ptr, 1, (MonoClass_ptr)) ICALL_TYPE(RTPTRARRAY, "Mono.RuntimeGPtrArrayHandle", RTPTRARRAY_1) -HANDLES(RTPTRARRAY_1, "GPtrArrayFree", ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree, void, 1, (GPtrArray_ptr)) +NOHANDLES(ICALL(RTPTRARRAY_1, "GPtrArrayFree", ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree)) ICALL_TYPE(RTMARSHAL, "Mono.RuntimeMarshal", RTMARSHAL_1) HANDLES(RTMARSHAL_1, "FreeAssemblyName", ves_icall_Mono_RuntimeMarshal_FreeAssemblyName, void, 2, (MonoAssemblyName_ref, MonoBoolean)) diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index e798af936bf..851c79019ed 100644 --- a/mono/metadata/icall-def.h +++ b/mono/metadata/icall-def.h @@ -156,7 +156,7 @@ ICALL_TYPE(RTCLASS, "Mono.RuntimeClassHandle", RTCLASS_1) HANDLES(RTCLASS_1, "GetTypeFromClass", ves_icall_Mono_RuntimeClassHandle_GetTypeFromClass, MonoType_ptr, 1, (MonoClass_ptr)) ICALL_TYPE(RTPTRARRAY, "Mono.RuntimeGPtrArrayHandle", RTPTRARRAY_1) -HANDLES(RTPTRARRAY_1, "GPtrArrayFree", ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree, void, 1, (GPtrArray_ptr)) +NOHANDLES(ICALL(RTPTRARRAY_1, "GPtrArrayFree", ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree)) ICALL_TYPE(RTMARSHAL, "Mono.RuntimeMarshal", RTMARSHAL_1) HANDLES(RTMARSHAL_1, "FreeAssemblyName", ves_icall_Mono_RuntimeMarshal_FreeAssemblyName, void, 2, (MonoAssemblyName_ref, MonoBoolean)) diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index 0e3c5a31770..38af0341214 100644 --- a/mono/metadata/icall.c +++ b/mono/metadata/icall.c @@ -1926,7 +1926,7 @@ ves_icall_Mono_RuntimeClassHandle_GetTypeFromClass (MonoClass *klass, MonoError } void -ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree (GPtrArray *ptr_array, MonoError *error) +ves_icall_Mono_RuntimeGPtrArrayHandle_GPtrArrayFree (GPtrArray *ptr_array) { g_ptr_array_free (ptr_array, TRUE); } |