}
mono_loader_lock ();
- if (!field->parent->generic_inst)
+ if (!field->parent->generic_class)
g_hash_table_insert (image->field_cache, GUINT_TO_POINTER (token), field);
mono_loader_unlock ();
return field;
klass = klass->parent;
}
- if (sclass->generic_inst) {
+ if (sclass->generic_class) {
MonoClass *gclass;
MonoMethod *res;
- gclass = mono_class_from_mono_type (sclass->generic_inst->generic_type);
+ gclass = mono_class_from_mono_type (sclass->generic_class->generic_type);
mono_class_init (gclass);
res = find_method (gclass, ic, name, sig);
* token is the method_ref or method_def token used in a call IL instruction.
*/
MonoMethodSignature*
-mono_method_get_signature (MonoMethod *method, MonoImage *image, guint32 token)
+mono_method_get_signature_full (MonoMethod *method, MonoImage *image, guint32 token, MonoGenericContext *context)
{
int table = mono_metadata_token_table (token);
int idx = mono_metadata_token_index (token);
return method->signature;
}
- if (method->klass->generic_inst)
+ if (method->klass->generic_class)
return method->signature;
if (image->dynamic)
ptr = mono_metadata_blob_heap (image, cols [MONO_MEMBERREF_SIGNATURE]);
mono_metadata_decode_blob_size (ptr, &ptr);
- sig = mono_metadata_parse_method_signature (image, 0, ptr, NULL);
+ sig = mono_metadata_parse_method_signature_full (image, context, 0, ptr, NULL);
g_hash_table_insert (image->memberref_signatures, GUINT_TO_POINTER (token), sig);
}
+ sig = mono_class_inflate_generic_signature (image, sig, context);
+
return sig;
}
+MonoMethodSignature*
+mono_method_get_signature (MonoMethod *method, MonoImage *image, guint32 token)
+{
+ return mono_method_get_signature_full (method, image, token, NULL);
+}
+
static MonoMethod *
method_from_memberref (MonoImage *image, guint32 idx, MonoGenericContext *context)
{
if (klass->generic_container)
container = klass->generic_container;
- else if (klass->generic_inst) {
- g_assert (klass->generic_inst->container);
- container = klass->generic_inst->container;
+ else if (klass->generic_class) {
+ g_assert (klass->generic_class->container);
+ container = klass->generic_class->container;
}
ptr = mono_metadata_blob_heap (image, cols [MONO_MEMBERREF_SIGNATURE]);
mono_metadata_decode_blob_size (ptr, &ptr);
- sig = mono_metadata_parse_method_signature_full (image, container, 0, ptr, NULL);
+ sig = mono_metadata_parse_method_signature_full (image, (MonoGenericContext *) container, 0, ptr, NULL);
switch (class) {
case MONO_MEMBERREF_PARENT_TYPEREF:
method = find_method (klass, NULL, mname, sig);
if (!method)
g_warning ("Missing method %s in assembly %s typeref index %d", mname, image->name, nindex);
- else if (klass->generic_inst && (klass != method->klass))
+ else if (klass->generic_class && (klass != method->klass))
method = mono_class_inflate_generic_method (
- method, klass->generic_inst->context, klass);
+ method, klass->generic_class->context, klass);
mono_metadata_free_method_signature (sig);
return method;
}
}
static MonoMethod *
-method_from_methodspec (MonoImage *image, MonoGenericContainer *generic_container, guint32 idx)
+method_from_methodspec (MonoImage *image, MonoGenericContext *context, guint32 idx)
{
MonoMethod *method, *inflated;
MonoTableInfo *tables = image->tables;
- MonoGenericContext *context;
+ MonoGenericContext *new_context = NULL;
MonoGenericMethod *gmethod;
MonoGenericContainer *container = NULL;
const char *ptr;
container = ((MonoMethodNormal *) ((MonoMethodInflated *) method)->declaring)->generic_container;
else
container = ((MonoMethodNormal *) method)->generic_container;
- g_assert (container && container->method);
- if (generic_container)
- container->parent = generic_container;
+ g_assert (container && container->is_method);
+
+ if (context) {
+ g_assert (context->container);
+ container->parent = context->container;
+ if (container->parent->is_method)
+ container->parent = container->parent->parent;
+ }
gmethod = g_new0 (MonoGenericMethod, 1);
gmethod->container = container;
- gmethod->mtype_argc = param_count;
- gmethod->mtype_argv = g_new0 (MonoType *, param_count);
- for (i = 0; i < param_count; i++) {
- gmethod->mtype_argv [i] = mono_metadata_parse_type_full (
- image, container, MONO_PARSE_TYPE, 0, ptr, &ptr);
+ gmethod->inst = mono_metadata_parse_generic_inst (
+ image, (MonoGenericContext *) container, param_count, ptr, &ptr);
+
+ if (context)
+ gmethod->inst = mono_metadata_inflate_generic_inst (gmethod->inst, context);
- if (!gmethod->is_open)
- gmethod->is_open = mono_class_is_open_constructed_type (gmethod->mtype_argv [i]);
+ if (!container->method_hash)
+ container->method_hash = g_hash_table_new (
+ (GHashFunc)mono_metadata_generic_method_hash, (GEqualFunc)mono_metadata_generic_method_equal);
+
+ inflated = g_hash_table_lookup (container->method_hash, gmethod);
+ if (inflated) {
+ g_free (gmethod);
+ return inflated;
}
- context = g_new0 (MonoGenericContext, 1);
- context->gmethod = gmethod;
+ if (!context) {
+ new_context = g_new0 (MonoGenericContext, 1);
+ new_context->container = container;
+ new_context->gmethod = gmethod;
+
+ context = new_context;
+ } else {
+ new_context = g_new0 (MonoGenericContext, 1);
+ new_context->container = container;
+ new_context->gmethod = gmethod;
+ new_context->gclass = context->gclass;
+
+ context = new_context;
+ }
mono_stats.generics_metadata_size += sizeof (MonoGenericMethod) +
sizeof (MonoGenericContext) + param_count * sizeof (MonoType);
inflated = mono_class_inflate_generic_method (method, context, NULL);
+ g_hash_table_insert (container->method_hash, gmethod, inflated);
- context->ginst = inflated->klass->generic_inst;
+ if (new_context)
+ context->gclass = inflated->klass->generic_class;
return inflated;
}
if (exc_class) {
*exc_class = "DllNotFoundException";
- *exc_arg = orig_scope;
+ *exc_arg = new_scope;
}
return NULL;
}
if (table != MONO_TABLE_METHOD) {
MonoGenericContainer *generic_container = NULL;
if (context) {
- if (context->ginst) {
- g_assert (context->ginst->container);
- generic_container = context->ginst->container;
- } else
- generic_container = context->container;
+ g_assert (context->container);
+ generic_container = context->container;
}
if (table == MONO_TABLE_METHODSPEC)
- return method_from_methodspec (image, generic_container, idx);
+ return method_from_methodspec (image, context, idx);
if (table != MONO_TABLE_MEMBERREF)
g_print("got wrong token: 0x%08x\n", token);
g_assert (table == MONO_TABLE_MEMBERREF);
generic_container = mono_metadata_load_generic_params (image, token);
if (generic_container) {
generic_container->parent = container;
- generic_container->method = result;
+ generic_container->is_method = 1;
container = generic_container;
}
}
if (!sig) /* already taken from the methodref */
sig = mono_metadata_blob_heap (image, cols [4]);
size = mono_metadata_decode_blob_size (sig, &sig);
- result->signature = mono_metadata_parse_method_signature_full (image, container, idx, sig, NULL);
+ result->signature = mono_metadata_parse_method_signature_full (
+ image, (MonoGenericContext *) container, idx, sig, NULL);
if (!result->klass) {
guint32 type = mono_metadata_typedef_from_method (image, token);
}
}
}
+
+ /* FIXME: lazyness for generics too, but how? */
+ if (!result->klass->dummy && !(result->flags & METHOD_ATTRIBUTE_ABSTRACT) &&
+ !(result->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) && container) {
+ gpointer loc = mono_image_rva_map (image, cols [0]);
+ g_assert (loc);
+ ((MonoMethodNormal *) result)->header = mono_metadata_parse_mh_full (
+ image, (MonoGenericContext *) container, loc);
+ }
+
((MonoMethodNormal *) result)->generic_container = generic_container;
}
for (i = 0; i < method->signature->param_count; ++i)
names [i] = "";
- if (klass->generic_inst) /* copy the names later */
+ if (klass->generic_class) /* copy the names later */
return;
mono_class_init (klass);
MonoClass *klass = method->klass;
MonoTableInfo *methodt;
- if (klass->generic_inst)
+ if (klass->generic_class)
g_assert_not_reached ();
mono_class_init (klass);
gpointer loc;
MonoMethodNormal* mn = (MonoMethodNormal*) method;
+#ifdef G_LIKELY
if (G_LIKELY (mn->header))
+#else
+ if (mn->header)
+#endif
return mn->header;
- if (method->klass->dummy || (method->flags & METHOD_ATTRIBUTE_ABSTRACT) || (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME))
+ if (method->klass->dummy || (method->flags & METHOD_ATTRIBUTE_ABSTRACT) || (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) || (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
return NULL;
mono_loader_lock ();
g_assert (loc);
- mn->header = mono_metadata_parse_mh_full (img, mn->generic_container, loc);
+ mn->header = mono_metadata_parse_mh_full (img, (MonoGenericContext *) mn->generic_container, loc);
mono_loader_unlock ();
return mn->header;
projects / mono.git / blobdiff