From ee7261b19df77612a1ed2732f66758157f990036 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 19 Jul 2011 15:08:33 +0200 Subject: [PATCH] backport: re PR c/49644 (post-increment of promoted operand is incorrect.) Backport from mainline 2011-07-07 Jakub Jelinek PR c/49644 * typeck.c (cp_build_binary_op): For MULT_EXPR and TRUNC_DIV_EXPR with one non-complex and one complex argument, call save_expr on both operands. * g++.dg/torture/pr49644.C: New test. From-SVN: r176457 --- gcc/cp/ChangeLog | 10 ++++++++++ gcc/cp/typeck.c | 2 ++ gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/torture/pr49644.C | 17 +++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 gcc/testsuite/g++.dg/torture/pr49644.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 69dcf301052f..cbe8bc3b16cb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2011-07-19 Jakub Jelinek + + Backport from mainline + 2011-07-07 Jakub Jelinek + + PR c/49644 + * typeck.c (cp_build_binary_op): For MULT_EXPR and TRUNC_DIV_EXPR with + one non-complex and one complex argument, call save_expr on both + operands. + 2011-06-23 Jason Merrill PR c++/49440 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 8ccb32d93c51..7cdcee939fe4 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4297,6 +4297,7 @@ cp_build_binary_op (location_t location, { case MULT_EXPR: case TRUNC_DIV_EXPR: + op1 = save_expr (op1); imag = build2 (resultcode, real_type, imag, op1); /* Fall through. */ case PLUS_EXPR: @@ -4315,6 +4316,7 @@ cp_build_binary_op (location_t location, switch (code) { case MULT_EXPR: + op0 = save_expr (op0); imag = build2 (resultcode, real_type, op0, imag); /* Fall through. */ case PLUS_EXPR: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d758a7612e64..aa95f8a2fed0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -3,6 +3,9 @@ Backport from mainline 2011-07-07 Jakub Jelinek + PR c/49644 + * g++.dg/torture/pr49644.C: New test. + PR c/49644 * gcc.c-torture/execute/pr49644.c: New test. diff --git a/gcc/testsuite/g++.dg/torture/pr49644.C b/gcc/testsuite/g++.dg/torture/pr49644.C new file mode 100644 index 000000000000..5fb82e0177e5 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr49644.C @@ -0,0 +1,17 @@ +// PR c/49644 +// { dg-do run } + +extern "C" void abort (); + +int +main () +{ + _Complex double a[12], *c = a, s = 3.0 + 1.0i; + double b[12] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }, *d = b; + int i; + for (i = 0; i < 6; i++) + *c++ = *d++ * s; + if (c != a + 6 || d != b + 6) + abort (); + return 0; +} -- 2.47.2