OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR middle-end/64824 (ICE in gimple verification)

Browse Source 
PR c/64824
	PR c/64868
gcc/c/
	* c-parser.c (c_parser_omp_atomic): Handle RDIV_EXPR.
gcc/cp/
	* parser.c (cp_parser_omp_atomic): Handle RDIV_EXPR.
gcc/c-family/
	* c-omp.c (c_finish_omp_atomic): Use TRUNC_DIV_EXPR
	instead of RDIV_EXPR.  Use build_binary_op instead of
	build2_loc.
libgomp/
	* testsuite/libgomp.c/pr64824.c: New test.
	* testsuite/libgomp.c/pr64868.c: New test.
	* testsuite/libgomp.c++/pr64824.C: New test.
	* testsuite/libgomp.c++/pr64868.C: New test.

From-SVN: r220420
This commit is contained in:
Jakub Jelinek 2015-02-04 23:32:36 +01:00 committed by Jakub Jelinek
parent 5a33f47d99
commit 4886ec8e70
11 changed files with 148 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/c-family/ChangeLog
View File

@ -1,3 +1,11 @@
2015-02-04 Jakub Jelinek <jakub@redhat.com>
PR c/64824
PR c/64868
* c-omp.c (c_finish_omp_atomic): Use TRUNC_DIV_EXPR
instead of RDIV_EXPR. Use build_binary_op instead of
build2_loc.
2015-01-30 Joseph Myers <joseph@codesourcery.com>
* c-opts.c, c-pch.c, cppspec.c: All callers of fatal_error changed

5
gcc/c-family/c-omp.c
View File

@ -206,6 +206,9 @@ c_finish_omp_atomic (location_t loc, enum tree_code code,
return error_mark_node;
}
if (opcode == RDIV_EXPR)
opcode = TRUNC_DIV_EXPR;
/* ??? Validate that rhs does not overlap lhs. */
/* Take and save the address of the lhs. From then on we'll reference it
@ -240,7 +243,7 @@ c_finish_omp_atomic (location_t loc, enum tree_code code,
to do this, and then take it apart again. */
if (swapped)
{
rhs = build2_loc (loc, opcode, TREE_TYPE (lhs), rhs, lhs);
rhs = build_binary_op (loc, opcode, rhs, lhs, 1);
opcode = NOP_EXPR;
}
bool save = in_late_binary_op;

6
gcc/c/ChangeLog
View File

@ -1,3 +1,9 @@
2015-02-04 Jakub Jelinek <jakub@redhat.com>
PR c/64824
PR c/64868
* c-parser.c (c_parser_omp_atomic): Handle RDIV_EXPR.
2015-02-02 Bruno Loff <bruno.loff@gmail.com>
* c-parser.c (c_parser_declspecs): Call invoke_plugin_callbacks after

1
gcc/c/c-parser.c
View File

@ -12611,6 +12611,7 @@ restart:
{
case MULT_EXPR:
case TRUNC_DIV_EXPR:
case RDIV_EXPR:
case PLUS_EXPR:
case MINUS_EXPR:
case LSHIFT_EXPR:

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2015-02-04 Jakub Jelinek <jakub@redhat.com>
PR c/64824
PR c/64868
* parser.c (cp_parser_omp_atomic): Handle RDIV_EXPR.
2015-02-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/64877

1
gcc/cp/parser.c
View File

@ -29835,6 +29835,7 @@ restart:
{
case MULT_EXPR:
case TRUNC_DIV_EXPR:
case RDIV_EXPR:
case PLUS_EXPR:
case MINUS_EXPR:
case LSHIFT_EXPR:

9
libgomp/ChangeLog
View File

@ -1,3 +1,12 @@
2015-02-04 Jakub Jelinek <jakub@redhat.com>
PR c/64824
PR c/64868
* testsuite/libgomp.c/pr64824.c: New test.
* testsuite/libgomp.c/pr64868.c: New test.
* testsuite/libgomp.c++/pr64824.C: New test.
* testsuite/libgomp.c++/pr64868.C: New test.
2015-02-01 David Edelsohn <dje.gcc@gmail.com>
PR libgomp/64635

5
libgomp/testsuite/libgomp.c++/pr64824.C Normal file
View File

@ -0,0 +1,5 @@
// PR c/64824
// { dg-do run }
// { dg-options "-O2 -fopenmp" }
#include "../libgomp.c/pr64824.c"

5
libgomp/testsuite/libgomp.c++/pr64868.C Normal file
View File

@ -0,0 +1,5 @@
// PR c/64868
// { dg-do run }
// { dg-options "-O2 -fopenmp" }
#include "../libgomp.c/pr64868.c"

16
libgomp/testsuite/libgomp.c/pr64824.c Normal file
View File

@ -0,0 +1,16 @@
/* PR c/64824 */
/* { dg-do run } */
/* { dg-options "-O2 -fopenmp" } */
int
main ()
{
long long a;
long long b = 1LL;
int c = 3;
#pragma omp atomic capture
a = b = c << b;
if (b != 6LL || a != 6LL)
__builtin_abort ();
return 0;
}

87
libgomp/testsuite/libgomp.c/pr64868.c Normal file
View File

@ -0,0 +1,87 @@
/* PR c/64868 */
/* { dg-do run } */
/* { dg-options "-O2 -fopenmp" } */
float f = 2.0f;
double d = 4.0;
long double ld = 8.0L;
void
foo ()
{
#pragma omp atomic
f = 1.0f / f;
#pragma omp atomic
f = 1 / f;
#pragma omp atomic
f = f / 2.0f;
#pragma omp atomic
f = f / 2;
#pragma omp atomic
f /= 2.0f;
#pragma omp atomic
f /= 2;
#pragma omp atomic
d = 1.0 / d;
#pragma omp atomic
d = 1 / d;
#pragma omp atomic
d = d / 2.0;
#pragma omp atomic
d = d / 2;
#pragma omp atomic
d /= 2.0;
#pragma omp atomic
d /= 2;
#pragma omp atomic
ld = 1.0L / ld;
#pragma omp atomic
ld = 1 / ld;
#pragma omp atomic
ld = ld / 2.0L;
#pragma omp atomic
ld = ld / 2;
#pragma omp atomic
ld /= 2.0L;
#pragma omp atomic
ld /= 2;
if (f != 0.125f || d != 0.25 || ld != 0.5L)
__builtin_abort ();
}
#ifdef __cplusplus
template <typename T, int N1, int N2>
void
bar ()
{
T v = ::d;
#pragma omp atomic
v *= 16;
#pragma omp atomic
v = 1.0 / v;
#pragma omp atomic
v = N1 / v;
#pragma omp atomic
v = v / 2.0;
#pragma omp atomic
v = v / N2;
#pragma omp atomic
v /= 2.0;
#pragma omp atomic
v /= N2;
if (v != 0.25)
__builtin_abort ();
}
#endif
int
main ()
{
foo ();
#ifdef __cplusplus
bar<float, 1, 2> ();
bar<double, 1, 2> ();
bar<long double, 1, 2> ();
#endif
return 0;
}