aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e1ff311..fe6b7da 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
2011-07-25 Paolo Carlini <paolo.carlini@oracle.com>
+ PR bootstrap/49845
+ * parser.c (cp_parser_perform_range_for_lookup): Always assign *being
+ and *end before returning.
+
+2011-07-25 Paolo Carlini <paolo.carlini@oracle.com>
+
PR c++/49838
* parser.c (cp_parser_perform_range_for_lookup): Early return if
error_operand_p (range).
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c687a34..b7410d5 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -8796,7 +8796,10 @@ static tree
cp_parser_perform_range_for_lookup (tree range, tree *begin, tree *end)
{
if (error_operand_p (range))
- return error_mark_node;
+ {
+ *begin = *end = error_mark_node;
+ return error_mark_node;
+ }
if (!COMPLETE_TYPE_P (complete_type (TREE_TYPE (range))))
{