[runtime] Fix a regression introduced by 1be62d5e2a325d45159485629a9ef6158aac0984...
authorZoltan Varga <vargaz@gmail.com>
Mon, 17 Oct 2016 21:19:44 +0000 (17:19 -0400)
committerZoltan Varga <vargaz@gmail.com>
Mon, 17 Oct 2016 21:19:44 +0000 (17:19 -0400)
mono/metadata/class.c

index f27576ead28065e84a7c64413c5834970bb96c56..a147e41a075ba753e735cd5c33489aaa441ab7d2 100644 (file)
@@ -2074,8 +2074,11 @@ mono_class_layout_fields (MonoClass *klass, int base_instance_size, int packing_
        klass->has_references = has_references;
        klass->packing_size = packing_size;
        klass->min_align = min_align;
-       for (i = 0; i < top; ++i)
-               klass->fields [i].offset = field_offsets [i];
+       for (i = 0; i < top; ++i) {
+               field = &klass->fields [i];
+               if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
+                       klass->fields [i].offset = field_offsets [i];
+       }
 
        mono_memory_barrier ();
        klass->size_inited = 1;