From d22f0231e60287574538fc60f743f9464a0977f4 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 17 Nov 2009 08:01:18 +0100 Subject: [PATCH] re PR c++/42061 ([c++0x] ICE with invalid initializer list for reference) PR c++/42061 * call.c (reference_binding): Return NULL for initializer list with error operand inside of it. * g++.dg/cpp0x/initlist27.C: New test. From-SVN: r154238 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 2 ++ gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp0x/initlist27.C | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist27.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d1db746c794..4f5f9b54248 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2009-11-17 Jakub Jelinek + PR c++/42061 + * call.c (reference_binding): Return NULL for initializer list with + error operand inside of it. + PR c++/42059 * typeck.c (cp_build_modify_expr): For initializer list call check_array_initializer to make sure lhs isn't a VLA. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index e4a6bca347f..e051e907220 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -1235,6 +1235,8 @@ reference_binding (tree rto, tree rfrom, tree expr, bool c_cast_p, int flags) && CONSTRUCTOR_NELTS (expr) == 1) { expr = CONSTRUCTOR_ELT (expr, 0)->value; + if (error_operand_p (expr)) + return NULL; from = TREE_TYPE (expr); } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 325bcf9b53b..f73a427fa09 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2009-11-17 Jakub Jelinek + PR c++/42061 + * g++.dg/cpp0x/initlist27.C: New test. + PR c++/42059 * g++.dg/cpp0x/initlist26.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist27.C b/gcc/testsuite/g++.dg/cpp0x/initlist27.C new file mode 100644 index 00000000000..f8536d3e7e7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist27.C @@ -0,0 +1,5 @@ +// PR c++/42061 +// { dg-do compile } +// { dg-options "-std=c++0x" } + +int& i = { j }; // { dg-error "invalid initialization|was not declared" } -- 2.30.2