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

re PR c++/67504 (ICE with type dependent collapse argument)

Browse source 
PR c++/67504
	* parser.c (cp_parser_omp_clause_collapse): Test tree_fits_shwi_p
	before INTEGRAL_TYPE_P test.

	* g++.dg/gomp/pr67504.C: New test.

From-SVN: r227579
This commit is contained in:
Jakub Jelinek 2015-09-09 09:25:53 +02:00 • committed by Jakub Jelinek
parent 0bb99c1162
commit 6cbf37c3d5
4 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2015-09-09 Jakub Jelinek <jakub@redhat.com>
PR c++/67504
* parser.c (cp_parser_omp_clause_collapse): Test tree_fits_shwi_p
before INTEGRAL_TYPE_P test.
2015-09-08 Jason Merrill <jason@redhat.com>
PR c++/67041

4
gcc/cp/parser.c
View file

@ -29228,8 +29228,8 @@ cp_parser_omp_clause_collapse (cp_parser *parser, tree list, location_t location
if (num == error_mark_node)
return list;
num = fold_non_dependent_expr (num);
if (!INTEGRAL_TYPE_P (TREE_TYPE (num))
|| !tree_fits_shwi_p (num)
if (!tree_fits_shwi_p (num)
|| !INTEGRAL_TYPE_P (TREE_TYPE (num))
|| (n = tree_to_shwi (num)) <= 0
|| (int) n != n)
{

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2015-09-09 Jakub Jelinek <jakub@redhat.com>
PR c++/67504
* g++.dg/gomp/pr67504.C: New test.
PR c/67501
* c-c++-common/gomp/pr67501.c: New test.

15
gcc/testsuite/g++.dg/gomp/pr67504.C Normal file
View file

@ -0,0 +1,15 @@
// PR c++/67504
// { dg-do compile }
// { dg-options "-fopenmp" }
int bar (int);
double bar (double);
template <typename T>
void
foo (T x)
{
#pragma omp for collapse (x + 1) // { dg-error "collapse argument needs positive constant integer expression" }
for (int i = 0; i < 10; i++)
;
}