c-parser.c (c_parser_postfix_expression): Fix merge glitch.

2009-06-25  Richard Guenther  <rguenther@suse.de>

        * c-parser.c (c_parser_postfix_expression): Fix merge
        glitch.

From-SVN: r148945

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8e5729a90a5299279f2d2215e904d9da7ca6c4c..036ca97ebce64e6a5973d7771d36cfd88720e545 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-25  Richard Guenther  <rguenther@suse.de>
+
+       * c-parser.c (c_parser_postfix_expression): Fix merge glitch.
+
 2009-06-25  Richard Guenther  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index 7c721d20f943f17a2a61d67cf4c14d67fa7949aa..573bd0595632f9534c6d37d9db903889bd845770 100644 (file)
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -5356,7 +5356,6 @@ c_parser_postfix_expression (c_parser *parser)
                  {
                    if (c_parser_next_token_is (parser, CPP_DEREF))
                      {
-                       loc = c_parser_peek_token (parser)->location;
                        offsetof_ref = build_array_ref (offsetof_ref,
                                                        integer_zero_node);
                        goto do_dot;