From: Martin Baulig <martin@novell.com>
Date: Tue, 30 Mar 2004 00:25:53 +0000 (-0000)
Subject: 2004-03-29  Martin Baulig  <martin@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=ec85a9d265946e3c516e69c1706ba7516b24e8b1;p=mono.git

2004-03-29  Martin Baulig  <martin@ximian.com>

	* icall.c (ves_icall_MonoMethod_get_HasGenericParameters): Show
	the "official" behavior here.
	(ves_icall_MonoMethod_get_Mono_IsInflatedMethod): New interncall.

svn path=/trunk/mono/; revision=24739
---

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 20521134f2e..7eca5015c24 100644
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-29  Martin Baulig  <martin@ximian.com>
+
+	* icall.c (ves_icall_MonoMethod_get_HasGenericParameters): Show
+	the "official" behavior here.
+	(ves_icall_MonoMethod_get_Mono_IsInflatedMethod): New interncall.
+
 2004-03-29  Martin Baulig  <martin@ximian.com>
 
 	* icall.c: Reflect latest API changes.
diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 84bfb17ca8d..b404101a832 100644
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -2078,8 +2078,19 @@ ves_icall_MonoMethod_get_HasGenericParameters (MonoReflectionMethod *method)
 	    (method->method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL))
 		return FALSE;
 
-	return method->method->signature->is_inflated ||
-		method->method->signature->generic_param_count != 0;
+	return method->method->signature->generic_param_count != 0;
+}
+
+static gboolean
+ves_icall_MonoMethod_get_Mono_IsInflatedMethod (MonoReflectionMethod *method)
+{
+	MONO_ARCH_SAVE_REGS;
+
+	if ((method->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
+	    (method->method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL))
+		return FALSE;
+
+	return method->method->signature->is_inflated;
 }
 
 static gboolean
@@ -5114,7 +5125,9 @@ static const IcallEntry module_icalls [] = {
 };
 
 static const IcallEntry monocmethod_icalls [] = {
-	{"InternalInvoke", ves_icall_InternalInvoke}
+  	{"GetGenericMethodDefinition_impl", ves_icall_MonoMethod_GetGenericMethodDefinition},
+	{"InternalInvoke", ves_icall_InternalInvoke},
+	{"get_Mono_IsInflatedMethod", ves_icall_MonoMethod_get_Mono_IsInflatedMethod}
 };
 
 static const IcallEntry monoeventinfo_icalls [] = {
@@ -5150,6 +5163,7 @@ static const IcallEntry monomethod_icalls [] = {
 	{"InternalInvoke", ves_icall_InternalInvoke},
 	{"get_HasGenericParameters", ves_icall_MonoMethod_get_HasGenericParameters},
 	{"get_IsGenericMethodDefinition", ves_icall_MonoMethod_get_IsGenericMethodDefinition},
+	{"get_Mono_IsInflatedMethod", ves_icall_MonoMethod_get_Mono_IsInflatedMethod},
 	{"get_base_definition", ves_icall_MonoMethod_get_base_definition}
 };