projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #956 from ermshiperete/bug-xamarin-14987
[mono.git]
/
mono
/
metadata
/
marshal.c
diff --git
a/mono/metadata/marshal.c
b/mono/metadata/marshal.c
index fa50598f7d72c68a36f2b4396988c2f24a6b61ba..792a1dcf37eae662456b75b0dfa42202ec2db2b0 100644
(file)
--- a/
mono/metadata/marshal.c
+++ b/
mono/metadata/marshal.c
@@
-4297,7
+4297,11
@@
mono_marshal_get_delegate_invoke (MonoMethod *method, MonoDelegate *del)
invoke_sig = static_sig;
if (static_method_with_first_arg_bound)
invoke_sig = static_sig;
if (static_method_with_first_arg_bound)
- name = mono_signature_to_name (invoke_sig, "invoke_bound_");
+ name = mono_signature_to_name (invoke_sig, "invoke_bound");
+ else if (closed_over_null)
+ name = mono_signature_to_name (invoke_sig, "invoke_closed_over_null");
+ else if (callvirt)
+ name = mono_signature_to_name (invoke_sig, "invoke_callvirt");
else
name = mono_signature_to_name (sig, "invoke");
if (ctx)
else
name = mono_signature_to_name (sig, "invoke");
if (ctx)
@@
-9656,8
+9660,8
@@
mono_marshal_get_vtfixup_ftnptr (MonoImage *image, guint32 token, guint16 type)
sig = mono_method_signature (method);
mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_MANAGED_TO_MANAGED);
sig = mono_method_signature (method);
mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_MANAGED_TO_MANAGED);
-#ifndef DISABLE_JIT
param_count = sig->param_count + sig->hasthis;
param_count = sig->param_count + sig->hasthis;
+#ifndef DISABLE_JIT
for (i = 0; i < param_count; i++)
mono_mb_emit_ldarg (mb, i);
for (i = 0; i < param_count; i++)
mono_mb_emit_ldarg (mb, i);
@@
-11800,7
+11804,9
@@
ves_icall_System_Runtime_InteropServices_Marshal_SizeOf (MonoReflectionType *rty
layout = (klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK);
layout = (klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK);
- if (layout == TYPE_ATTRIBUTE_AUTO_LAYOUT) {
+ if (type->type == MONO_TYPE_PTR || type->type == MONO_TYPE_FNPTR) {
+ return sizeof (gpointer);
+ } else if (layout == TYPE_ATTRIBUTE_AUTO_LAYOUT) {
gchar *msg;
MonoException *exc;
gchar *msg;
MonoException *exc;
@@
-12290,7
+12296,7
@@
mono_marshal_load_type_info (MonoClass* klass)
case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
size = mono_marshal_type_size (field->type, info->fields [j].mspec,
&align, TRUE, klass->unicode);
case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
size = mono_marshal_type_size (field->type, info->fields [j].mspec,
&align, TRUE, klass->unicode);
- min_align =
packing
;
+ min_align =
MAX (align, min_align)
;
info->fields [j].offset = field->offset - sizeof (MonoObject);
info->native_size = MAX (info->native_size, info->fields [j].offset + size);
break;
info->fields [j].offset = field->offset - sizeof (MonoObject);
info->native_size = MAX (info->native_size, info->fields [j].offset + size);
break;
@@
-12304,9
+12310,12
@@
mono_marshal_load_type_info (MonoClass* klass)
* If the provided Size is equal or larger than the calculated size, and there
* was no Pack attribute, we set min_align to 1 to avoid native_size being increased
*/
* If the provided Size is equal or larger than the calculated size, and there
* was no Pack attribute, we set min_align to 1 to avoid native_size being increased
*/
- if (layout == TYPE_ATTRIBUTE_EXPLICIT_LAYOUT)
+ if (layout == TYPE_ATTRIBUTE_EXPLICIT_LAYOUT)
{
if (native_size && native_size == info->native_size && klass->packing_size == 0)
min_align = 1;
if (native_size && native_size == info->native_size && klass->packing_size == 0)
min_align = 1;
+ else
+ min_align = MIN (min_align, packing);
+ }
}
if (info->native_size & (min_align - 1)) {
}
if (info->native_size & (min_align - 1)) {