From 74aad7cc3cfb851fd1c0c08a037592b6014f884d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 15 Jan 2005 00:45:59 +0100 Subject: [PATCH] re PR c++/19263 (wrong-code: explicit initialization of v8qi miscompiled) PR c++/19263 * typeck2.c (split_nonconstant_init_1) : Put a copy of CONSTRUCTOR's node into MODIFY_EXPR, as the original is modified. * g++.dg/init/vector1.C: New test. From-SVN: r93672 --- gcc/cp/ChangeLog | 6 +++ gcc/cp/typeck2.c | 3 +- gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/g++.dg/init/vector1.C | 78 +++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/init/vector1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 89207d34eedc..b5e9d32653ca 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2005-01-15 Jakub Jelinek + + PR c++/19263 + * typeck2.c (split_nonconstant_init_1) : Put a copy + of CONSTRUCTOR's node into MODIFY_EXPR, as the original is modified. + 2005-01-12 Kaveh R. Ghazi * Make-lang.in (cp-warn): Don't append $(WERROR). diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 8d97e451c6de..7edfdd277b3c 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -506,8 +506,9 @@ split_nonconstant_init_1 (tree dest, tree init) case VECTOR_TYPE: if (!initializer_constant_valid_p (init, type)) { + tree cons = copy_node (init); CONSTRUCTOR_ELTS (init) = NULL; - code = build2 (MODIFY_EXPR, type, dest, init); + code = build2 (MODIFY_EXPR, type, dest, cons); code = build_stmt (EXPR_STMT, code); add_stmt (code); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b0e7898293e6..8024db30a67b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-01-15 Jakub Jelinek + + PR c++/19263 + * g++.dg/init/vector1.C: New test. + 2005-01-14 James E. Wilson PR target/13158 diff --git a/gcc/testsuite/g++.dg/init/vector1.C b/gcc/testsuite/g++.dg/init/vector1.C new file mode 100644 index 000000000000..ce4f40c90829 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/vector1.C @@ -0,0 +1,78 @@ +// PR c++/19263 +// { dg-do run } +// { dg-options "-O2" } + +typedef signed char v8qi __attribute__ ((vector_size (8))); + +extern "C" void abort (void); + +static unsigned char S[16]; + +struct A +{ + int i; + v8qi j, k; + int l; +}; + +void +foo (unsigned char v) +{ + A a = { 1, { v, v, v, v, v, v, v, v }, + { v + 1, v + 1, v + 1, v + 1, v + 1, v + 1, v + 1, v + 1 }, 3 }; + v8qi *s = (v8qi *) &S[0]; + *s = a.j; + s[1] = a.k; +} + +void +bar (unsigned char v) +{ + v8qi val8 = { v, v, v, v, v, v, v, v }; + v8qi *s = (v8qi *) &S[0]; + *s = val8; +} + +int n = 5, cnt; + +int +num (void) +{ + ++cnt; + return n; +} + +void +baz (void) +{ + static A a = { 0, { num (), num (), num (), num (), 6, 6, 6, 6 }, + { 7, 7, 7, 7, 8, 8, 8, 8 }, 0 }; + v8qi *s = (v8qi *) &S[0]; + *s = a.j; + s[1] = a.k; +} + +int +main () +{ + int i; + foo (1); + for (i = 0; i < 8; ++i) + if (S[i] != 1) + abort (); + for (; i < 16; ++i) + if (S[i] != 2) + abort (); + bar (3); + for (i = 0; i < 8; ++i) + if (S[i] != 3) + abort (); + return 0; + baz (); + if (cnt != 4) + abort (); + for (i = 0; i < 16; ++i) + if (S[i] != 5 + (i / 4)) + abort (); + return 0; +} -- 2.43.5