diff options
author | Jakub Jelinek <jakub@redhat.com> | 2018-12-07 16:20:04 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-12-07 16:20:04 +0100 |
commit | 29f0d7d457668f1a6acd3bd8b9ac67d37315d999 (patch) | |
tree | 42003eabe14eb777579eb4f5ce87ea29bf3abfde | |
parent | 26004f51f9cfb83d88d445903933fb8c39a841f1 (diff) | |
download | gcc-29f0d7d457668f1a6acd3bd8b9ac67d37315d999.zip gcc-29f0d7d457668f1a6acd3bd8b9ac67d37315d999.tar.gz gcc-29f0d7d457668f1a6acd3bd8b9ac67d37315d999.tar.bz2 |
re PR c++/86669 (Complete object constructor clone omits length for a c++11 braced initialiser)
PR c++/86669
* call.c (make_temporary_var_for_ref_to_temp): Call pushdecl even for
automatic vars.
* g++.dg/cpp0x/initlist105.C: New test.
* g++.dg/cpp0x/initlist106.C: New test.
* g++.dg/other/pr86669.C: New test.
From-SVN: r266893
-rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/cp/call.c | 4 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist105.C | 28 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist106.C | 29 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/other/pr86669.C | 10 |
6 files changed, 79 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index df8a9d0..6481ad4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2018-12-07 Jakub Jelinek <jakub@redhat.com> + PR c++/86669 + * call.c (make_temporary_var_for_ref_to_temp): Call pushdecl even for + automatic vars. + PR c++/87506 * constexpr.c (adjust_temp_type): Handle EMPTY_CLASS_EXPR. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 148e2d5..6328a36 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -11148,14 +11148,12 @@ make_temporary_var_for_ref_to_temp (tree decl, tree type) tree name = mangle_ref_init_variable (decl); DECL_NAME (var) = name; SET_DECL_ASSEMBLER_NAME (var, name); - - var = pushdecl (var); } else /* Create a new cleanup level if necessary. */ maybe_push_cleanup_level (type); - return var; + return pushdecl (var); } /* EXPR is the initializer for a variable DECL of reference or diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2312754..fd940b4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-12-07 Jakub Jelinek <jakub@redhat.com> + + PR c++/86669 + * g++.dg/cpp0x/initlist105.C: New test. + * g++.dg/cpp0x/initlist106.C: New test. + * g++.dg/other/pr86669.C: New test. + 2018-12-07 Richard Sandiford <richard.sandiford@arm.com> * gcc.target/aarch64/sve/pred_elim_2.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist105.C b/gcc/testsuite/g++.dg/cpp0x/initlist105.C new file mode 100644 index 0000000..3720a2d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist105.C @@ -0,0 +1,28 @@ +// PR c++/86669 +// { dg-do run { target c++11 } } + +#include <initializer_list> + +struct S { S (); }; +struct T : public S {}; +int cnt; +void foo (int) { cnt++; } + +S::S () +{ + int e = 1, f = 2, g = 3, h = 4; + + for (auto k : { e, f, g, h }) + foo (k); +} + +int +main () +{ + S s; + if (cnt != 4) + __builtin_abort (); + T t; + if (cnt != 8) + __builtin_abort (); +} diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist106.C b/gcc/testsuite/g++.dg/cpp0x/initlist106.C new file mode 100644 index 0000000..df0afac --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist106.C @@ -0,0 +1,29 @@ +// PR c++/86669 +// { dg-do run { target c++11 } } + +#include <initializer_list> + +struct A { }; +struct S : virtual public A { S (); }; +struct T : public S, virtual public A {}; +int cnt; +void foo (int) { cnt++; } + +S::S () +{ + int e = 1, f = 2, g = 3, h = 4; + + for (auto k : { e, f, g, h }) + foo (k); +} + +int +main () +{ + S s; + if (cnt != 4) + __builtin_abort (); + T t; + if (cnt != 8) + __builtin_abort (); +} diff --git a/gcc/testsuite/g++.dg/other/pr86669.C b/gcc/testsuite/g++.dg/other/pr86669.C new file mode 100644 index 0000000..d986bb1 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr86669.C @@ -0,0 +1,10 @@ +// PR c++/86669 +// { dg-do compile } + +struct S { S (); }; +struct T : public S {}; + +S::S () +{ + int *p = { (int *) &p }; +} |