Basile Starynkevitch <basile@starynkevitch.net>

        * gengtype.c (walk_type): Emit mark_hook when inside a
          struct of a union member.

From-SVN: r192092

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abdd91721316a929faa62b4e4dbc2bef45d2e141..2a7913557efe6ffbf891b13084415daf5d507651 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-04  Basile Starynkevitch  <basile@starynkevitch.net>
+
+        * gengtype.c (walk_type): Emit mark_hook when inside a
+          struct of a union member.
+
 2012-10-04  Georg-Johann Lay  <avr@gjlay.de>
 
        * config/avr/predicates.md (flash_operand): New predicate.

diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 2ae43726b59a50524d72db8b62f2d391f3ecbf47..d872b4ea78ab2e8692b0656024fa085170ee6ac6 100644 (file)
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -2810,6 +2810,7 @@ walk_type (type_p t, struct walk_type_data *d)
        const char *oldval = d->val;
        const char *oldprevval1 = d->prev_val[1];
        const char *oldprevval2 = d->prev_val[2];
+       const char *struct_mark_hook = NULL;
        const int union_p = t->kind == TYPE_UNION;
        int seen_default_p = 0;
        options_p o;
@@ -2833,6 +2834,13 @@ walk_type (type_p t, struct walk_type_data *d)
          if (!desc && strcmp (o->name, "desc") == 0
              && o->kind == OPTION_STRING)
            desc = o->info.string;
+         else if (!struct_mark_hook && strcmp (o->name, "mark_hook") == 0
+                  && o->kind == OPTION_STRING)
+           struct_mark_hook = o->info.string;
+
+       if (struct_mark_hook)
+         oprintf (d->of, "%*s%s (&%s));\n",
+                  d->indent, "", struct_mark_hook, oldval);
 
        d->prev_val[2] = oldval;
        d->prev_val[1] = oldprevval2;