From dfc38cdb877693b5547abf95ab9f5c96010ae8a8 Mon Sep 17 00:00:00 2001 From: kumpera Date: Fri, 7 May 2010 22:41:43 +0000 Subject: [PATCH] 2010-05-07 Rodrigo Kumpera * icall-def.h * icall.c: Delete some unused icalls. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@156926 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 5 +++++ mono/metadata/icall-def.h | 7 +------ mono/metadata/icall.c | 16 ---------------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 9da898992..6abb5935b 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,5 +1,10 @@ 2010-05-07 Rodrigo Kumpera + * icall-def.h + * icall.c: Delete some unused icalls. + +2010-05-07 Rodrigo Kumpera + * appdomain.c (mono_domain_has_type_resolve): Check for NULL domain objects to make pedump happy. diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index 5678a1325..a2c49034b 100644 --- a/mono/metadata/icall-def.h +++ b/mono/metadata/icall-def.h @@ -418,7 +418,6 @@ ICALL(MTYPE_26, "get_IsGenericParameter", ves_icall_MonoType_get_IsGenericParame ICALL(MTYPE_27, "get_Module", ves_icall_MonoType_get_Module) ICALL(MTYPE_28, "get_Name", ves_icall_MonoType_get_Name) ICALL(MTYPE_29, "get_Namespace", ves_icall_MonoType_get_Namespace) -ICALL(MTYPE_30, "get_UnderlyingSystemType", ves_icall_MonoType_get_UnderlyingSystemType) ICALL(MTYPE_31, "get_attributes", ves_icall_get_attributes) ICALL(MTYPE_33, "get_core_clr_security_level", vell_icall_MonoType_get_core_clr_security_level) ICALL(MTYPE_32, "type_from_obj", mono_type_type_from_obj) @@ -601,11 +600,7 @@ ICALL(MFIELD_4, "SetValueInternal", ves_icall_MonoField_SetValueInternal) ICALL_TYPE(MGENCM, "System.Reflection.MonoGenericCMethod", MGENCM_1) ICALL(MGENCM_1, "get_ReflectedType", ves_icall_MonoGenericMethod_get_ReflectedType) -ICALL_TYPE(MGENCL, "System.Reflection.MonoGenericClass", MGENCL_1) -ICALL(MGENCL_1, "GetElementType", ves_icall_MonoType_GetElementType) -ICALL(MGENCL_2, "IsByRefImpl", ves_icall_type_isbyref) -ICALL(MGENCL_3, "IsPointerImpl", ves_icall_type_ispointer) -ICALL(MGENCL_4, "IsPrimitiveImpl", ves_icall_type_isprimitive) +ICALL_TYPE(MGENCL, "System.Reflection.MonoGenericClass", MGENCL_5) ICALL(MGENCL_5, "initialize", mono_reflection_generic_class_initialize) ICALL(MGENCL_6, "register_with_runtime", mono_reflection_register_with_runtime) diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c index 970c74572..03f66bfda 100644 --- a/mono/metadata/icall.c +++ b/mono/metadata/icall.c @@ -2276,22 +2276,6 @@ ves_icall_MonoType_get_DeclaringType (MonoReflectionType *type) return class ? mono_type_get_object (domain, &class->byval_arg) : NULL; } -static MonoReflectionType* -ves_icall_MonoType_get_UnderlyingSystemType (MonoReflectionType *type) -{ - MonoDomain *domain = mono_domain_get (); - MonoClass *class = mono_class_from_mono_type (type->type); - - MONO_ARCH_SAVE_REGS; - - if (class->enumtype && mono_class_enum_basetype (class)) /* types that are modified typebuilders may not have enum_basetype set */ - return mono_type_get_object (domain, mono_class_enum_basetype (class)); - else if (class->element_class) - return mono_type_get_object (domain, &class->element_class->byval_arg); - else - return NULL; -} - static MonoString* ves_icall_MonoType_get_Name (MonoReflectionType *type) { -- 2.11.4.GIT