* semantics.c (finish_id_expression): Check for error_mark_node.
From-SVN: r216104
This commit is contained in:
parent
1740f8a1cd
commit
cfb71cadfd
2 changed files with 9 additions and 1 deletions
|
@ -1,3 +1,7 @@
|
|||
2014-10-10 Jason Merrill <jason@redhat.com>
|
||||
|
||||
* semantics.c (finish_id_expression): Check for error_mark_node.
|
||||
|
||||
2014-10-09 Jason Merrill <jason@redhat.com>
|
||||
|
||||
PR c++/63207
|
||||
|
|
|
@ -3272,7 +3272,11 @@ finish_id_expression (tree id_expression,
|
|||
/* Disallow uses of local variables from containing functions, except
|
||||
within lambda-expressions. */
|
||||
if (outer_automatic_var_p (decl))
|
||||
decl = process_outer_var_ref (decl, tf_warning_or_error);
|
||||
{
|
||||
decl = process_outer_var_ref (decl, tf_warning_or_error);
|
||||
if (decl == error_mark_node)
|
||||
return error_mark_node;
|
||||
}
|
||||
|
||||
/* Also disallow uses of function parameters outside the function
|
||||
body, except inside an unevaluated context (i.e. decltype). */
|
||||
|
|
Loading…
Add table
Reference in a new issue