gobject-introspection r1078 - in trunk: . girepository tests/offsets
- From: walters svn gnome org
- To: svn-commits-list gnome org
- Subject: gobject-introspection r1078 - in trunk: . girepository tests/offsets
- Date: Mon, 2 Feb 2009 16:31:02 +0000 (UTC)
Author: walters
Date: Mon Feb 2 16:31:02 2009
New Revision: 1078
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=1078&view=rev
Log:
Bug 563469 â Arrays not treated correctly in struct offset calculation
Arrays are currently not handled specially, and hence treated as pointers in
giroffsets.c:get_field_size_alignment(), which is (obviously) wrong.
Modified:
trunk/ChangeLog
trunk/girepository/giroffsets.c
trunk/tests/offsets/gen-gitestoffsets
trunk/tests/offsets/offsets.h
Modified: trunk/girepository/giroffsets.c
==============================================================================
--- trunk/girepository/giroffsets.c (original)
+++ trunk/girepository/giroffsets.c Mon Feb 2 16:31:02 2009
@@ -144,21 +144,19 @@
}
static gboolean
-get_interface_size_alignment (GIrNodeField *field,
- GIrNode *parent_node,
- GIrModule *module,
- GList *modules,
- gint *size,
- gint *alignment)
+get_interface_size_alignment (GIrNodeType *type,
+ GIrModule *module,
+ GList *modules,
+ gint *size,
+ gint *alignment,
+ const char *who)
{
- GIrNodeType *type = field->type;
GIrNode *iface;
GIrModule *iface_module;
if (!g_ir_find_node (module, modules, type->interface, &iface, &iface_module))
{
- g_warning ("Can't resolve type '%s' for field %s.%s.%s",
- type->interface, module->name, parent_node->name, ((GIrNode *)field)->name);
+ g_warning ("Can't resolve type '%s' for %s", type->interface, who);
*size = -1;
*alignment = -1;
return FALSE;
@@ -212,8 +210,8 @@
}
default:
{
- g_warning ("Field %s.%s.%s has is not a pointer and is of type %s",
- module->name, parent_node->name, ((GIrNode *)field)->name,
+ g_warning ("%s has is not a pointer and is of type %s",
+ who,
g_ir_node_type_to_string (iface->type));
*size = -1;
*alignment = -1;
@@ -225,17 +223,34 @@
}
static gboolean
-get_field_size_alignment (GIrNodeField *field,
- GIrNode *parent_node,
- GIrModule *module,
- GList *modules,
- gint *size,
- gint *alignment)
+get_type_size_alignment (GIrNodeType *type,
+ GIrModule *module,
+ GList *modules,
+ gint *size,
+ gint *alignment,
+ const char *who)
{
- GIrNodeType *type = field->type;
ffi_type *type_ffi;
- if (type->is_pointer)
+ if (type->tag == GI_TYPE_TAG_ARRAY)
+ {
+ gint elt_size, elt_alignment;
+
+ if (!type->has_size
+ || !get_type_size_alignment(type->parameter_type1, module, modules,
+ &elt_size, &elt_alignment, who))
+ {
+ *size = -1;
+ *alignment = -1;
+ return FALSE;
+ }
+
+ *size = type->size * elt_size;
+ *alignment = elt_alignment;
+
+ return TRUE;
+ }
+ else if (type->is_pointer)
{
type_ffi = &ffi_type_pointer;
}
@@ -243,9 +258,7 @@
{
if (type->tag == GI_TYPE_TAG_INTERFACE)
{
- return get_interface_size_alignment (field, parent_node,
- module, modules,
- size, alignment);
+ return get_interface_size_alignment (type, module, modules, size, alignment, who);
}
else
{
@@ -253,16 +266,15 @@
if (type_ffi == &ffi_type_void)
{
- g_warning ("Field %s.%s.%s has void type",
- module->name, parent_node->name, ((GIrNode *)field)->name);
+ g_warning ("%s has void type", who);
*size = -1;
*alignment = -1;
return FALSE;
}
else if (type_ffi == &ffi_type_pointer)
{
- g_warning ("Field %s.%s.%s has is not a pointer and is of type %s",
- module->name, parent_node->name, ((GIrNode *)field)->name,
+ g_warning ("%s has is not a pointer and is of type %s",
+ who,
g_type_tag_to_string (type->tag));
*size = -1;
*alignment = -1;
@@ -278,6 +290,25 @@
return TRUE;
}
+static gboolean
+get_field_size_alignment (GIrNodeField *field,
+ GIrNode *parent_node,
+ GIrModule *module,
+ GList *modules,
+ gint *size,
+ gint *alignment)
+{
+ gchar *who;
+ gboolean success;
+
+ who = g_strdup_printf ("field %s.%s.%s", module->name, parent_node->name, ((GIrNode *)field)->name);
+
+ success = get_type_size_alignment (field->type, module, modules, size, alignment, who);
+ g_free (who);
+
+ return success;
+}
+
#define ALIGN(n, align) (((n) + (align) - 1) & ~((align) - 1))
static gboolean
Modified: trunk/tests/offsets/gen-gitestoffsets
==============================================================================
--- trunk/tests/offsets/gen-gitestoffsets (original)
+++ trunk/tests/offsets/gen-gitestoffsets Mon Feb 2 16:31:02 2009
@@ -61,7 +61,7 @@
# This certainly can't handle all type declarations, but it only
# needs to handle the ones we use in the test cases
-FIELD_RE = compile_re("^(?:const\s+)?TOKEN(?:[\s*]+)(TOKEN)\s*;$");
+FIELD_RE = compile_re(r"^(?:const\s+)?TOKEN(?:[\s*]+)(TOKEN)\s*(?:\[([0-9]*)\])?\s*;$")
input_f = open(sys.argv[1])
Modified: trunk/tests/offsets/offsets.h
==============================================================================
--- trunk/tests/offsets/offsets.h (original)
+++ trunk/tests/offsets/offsets.h Mon Feb 2 16:31:02 2009
@@ -104,4 +104,18 @@
char dummy3;
};
+/* Test array offsets
+ */
+
+typedef struct _OffsetsArray OffsetsArray;
+
+struct _OffsetsArray
+{
+ gint some_ints[2];
+ gint8 some_int8s[3];
+ gdouble some_doubles[4];
+ Enum1 some_enum[2];
+ gpointer some_ptrs[5];
+};
+
#endif /* __OFFSETS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]