PR c/28504

[pf3gnuchains/gcc-fork.git] / gcc / c-parser.c

diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index 6e243df..8520253 100644 (file)
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -2537,6 +2537,7 @@ c_parser_parms_declarator (c_parser *parser, bool id_list_ok, tree attrs)
          ret->tags = 0;
          ret->types = list;
          ret->others = 0;
          ret->tags = 0;
          ret->types = list;
          ret->others = 0;

+         ret->pending_sizes = 0;

          ret->had_vla_unspec = 0;
          c_parser_consume_token (parser);
          pop_scope ();
          ret->had_vla_unspec = 0;
          c_parser_consume_token (parser);
          pop_scope ();


@@ -2579,6 +2580,7 @@ c_parser_parms_list_declarator (c_parser *parser, tree attrs)
       ret->tags = 0;
       ret->types = 0;
       ret->others = 0;
       ret->tags = 0;
       ret->types = 0;
       ret->others = 0;

+      ret->pending_sizes = 0;

       ret->had_vla_unspec = 0;
       c_parser_consume_token (parser);
       return ret;
       ret->had_vla_unspec = 0;
       c_parser_consume_token (parser);
       return ret;


@@ -2589,6 +2591,7 @@ c_parser_parms_list_declarator (c_parser *parser, tree attrs)
       ret->parms = 0;
       ret->tags = 0;
       ret->others = 0;
       ret->parms = 0;
       ret->tags = 0;
       ret->others = 0;

+      ret->pending_sizes = 0;

       ret->had_vla_unspec = 0;
       /* Suppress -Wold-style-definition for this case.  */
       ret->types = error_mark_node;
       ret->had_vla_unspec = 0;
       /* Suppress -Wold-style-definition for this case.  */
       ret->types = error_mark_node;


@@ -2640,6 +2643,7 @@ c_parser_parms_list_declarator (c_parser *parser, tree attrs)
              ret->tags = 0;
              ret->types = 0;
              ret->others = 0;
              ret->tags = 0;
              ret->types = 0;
              ret->others = 0;

+             ret->pending_sizes = 0;

              ret->had_vla_unspec = 0;
              return ret;
            }
              ret->had_vla_unspec = 0;
              return ret;
            }


@@ -2666,6 +2670,7 @@ c_parser_parms_list_declarator (c_parser *parser, tree attrs)
                  ret->tags = 0;
                  ret->types = 0;
                  ret->others = 0;
                  ret->tags = 0;
                  ret->types = 0;
                  ret->others = 0;

+                 ret->pending_sizes = 0;

                  ret->had_vla_unspec = 0;
                  return ret;
                }
                  ret->had_vla_unspec = 0;
                  return ret;
                }


@@ -5203,7 +5208,7 @@ c_parser_postfix_expression (c_parser *parser)
            if (type == error_mark_node)
              offsetof_ref = error_mark_node;
            else
            if (type == error_mark_node)
              offsetof_ref = error_mark_node;
            else

-             offsetof_ref = build1 (INDIRECT_REF, type, NULL);
+             offsetof_ref = build1 (INDIRECT_REF, type, null_pointer_node);

            /* Parse the second argument to __builtin_offsetof.  We
               must have one identifier, and beyond that we want to
               accept sub structure and sub array references.  */
            /* Parse the second argument to __builtin_offsetof.  We
               must have one identifier, and beyond that we want to
               accept sub structure and sub array references.  */


@@ -5245,7 +5250,7 @@ c_parser_postfix_expression (c_parser *parser)
              c_parser_error (parser, "expected identifier");
            c_parser_skip_until_found (parser, CPP_CLOSE_PAREN,
                                       "expected %<)%>");
              c_parser_error (parser, "expected identifier");
            c_parser_skip_until_found (parser, CPP_CLOSE_PAREN,
                                       "expected %<)%>");

-           expr.value = fold_offsetof (offsetof_ref);
+           expr.value = fold_offsetof (offsetof_ref, NULL_TREE);

            expr.original_code = ERROR_MARK;
          }
          break;
            expr.original_code = ERROR_MARK;
          }
          break;