From 3cebb784ec80a5b8ff6420e2ee792840f391455c Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 25 Jun 2009 14:36:43 +0000 Subject: [PATCH] c-parser.c (c_parser_postfix_expression): Fix merge glitch. 2009-06-25 Richard Guenther * c-parser.c (c_parser_postfix_expression): Fix merge glitch. From-SVN: r148945 --- gcc/ChangeLog | 4 ++++ gcc/c-parser.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e8e5729a90a5..036ca97ebce6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2009-06-25 Richard Guenther + + * c-parser.c (c_parser_postfix_expression): Fix merge glitch. + 2009-06-25 Richard Guenther Backport from mainline diff --git a/gcc/c-parser.c b/gcc/c-parser.c index 7c721d20f943..573bd0595632 100644 --- 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; -- 2.47.2