procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parser.c (cp_parser_constant_expression): Just return the non-constant expression.

Browse source 
* parser.c (cp_parser_constant_expression): Just return the
	non-constant expression.

From-SVN: r174882
This commit is contained in:
Jason Merrill 2011-06-09 23:55:41 -04:00 • committed by Jason Merrill
parent 8c53f5e2fa
commit b1623cc545
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-06-09 Jason Merrill <jason@redhat.com>
* parser.c (cp_parser_constant_expression): Just return the
non-constant expression.
* semantics.c (finish_compound_literal): Set TREE_HAS_CONSTRUCTOR.
2011-06-09 Paolo Carlini <paolo.carlini@oracle.com>

2
gcc/cp/parser.c
View file

@ -7050,8 +7050,6 @@ cp_parser_constant_expression (cp_parser* parser,
}
if (allow_non_constant_p)
*non_constant_p = parser->non_integral_constant_expression_p;
else if (parser->non_integral_constant_expression_p)
expression = error_mark_node;
parser->non_integral_constant_expression_p
= saved_non_integral_constant_expression_p;

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2011-06-09 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/regress/error-recovery1.C: Adjust.
* g++.dg/parse/template7.C: Adjust.
2011-06-09 Kaz Kojima <kkojima@gcc.gnu.org>
PR target/49307

2
gcc/testsuite/g++.dg/cpp0x/regress/error-recovery1.C
View file

@ -7,3 +7,5 @@ foo ()
const bool b =; // { dg-error "" }
foo < b > (); // { dg-error "constant expression" }
};
// { dg-error "no match" "" { target *-*-* } 8 }

1
gcc/testsuite/g++.dg/parse/template7.C
View file

@ -2,4 +2,3 @@ template <int I>
void f(); // { dg-message "note" }
void g() { f<(3, 2)>(); } // { dg-error "" }
// { dg-message "candidate" "candidate note" { target *-*-* } 4 }