From 3ea1e3286b2576fe9d265af2a4134e0d253f9f21 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 29 Jul 2013 20:12:20 +0000 Subject: [PATCH] re PR c++/57948 (internal compiler error: in initialize_reference, at cp/call.c:9285) /cp 2013-07-29 Paolo Carlini PR c++/57948 * call.c (initialize_reference): Don't crash when reference_binding returns a conv with conv->kind == ck_ambig. /testsuite 2013-07-29 Paolo Carlini PR c++/57948 * g++.dg/conversion/ambig2.C: New. From-SVN: r201318 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/call.c | 12 ++++++++---- gcc/testsuite/ChangeLog | 7 ++++++- gcc/testsuite/g++.dg/conversion/ambig2.C | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/conversion/ambig2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 21eaa1ff312..1bedc846215 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-07-29 Paolo Carlini + + PR c++/57948 + * call.c (initialize_reference): Don't crash when reference_binding + returns a conv with conv->kind == ck_ambig. + 2013-07-29 Jason Merrill * mangle.c (write_name): Check for null context. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index e8d526075a7..0574a9c1527 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -9282,10 +9282,14 @@ initialize_reference (tree type, tree expr, return error_mark_node; } - gcc_assert (conv->kind == ck_ref_bind); - - /* Perform the conversion. */ - expr = convert_like (conv, expr, complain); + if (conv->kind == ck_ref_bind) + /* Perform the conversion. */ + expr = convert_like (conv, expr, complain); + else if (conv->kind == ck_ambig) + /* We gave an error in build_user_type_conversion_1. */ + expr = error_mark_node; + else + gcc_unreachable (); /* Free all the conversions we allocated. */ obstack_free (&conversion_obstack, p); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7c022b70826..1a706889d67 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-07-29 Paolo Carlini + + PR c++/57948 + * g++.dg/conversion/ambig2.C: New. + 2013-07-29 Maciej W. Rozycki * gcc.target/mips/fabs-2008.c: New test case. @@ -85,7 +90,7 @@ * gcc.c-torture/execute/builtins/stpcpy-chk.x: Likewise. * gcc.dg/pr27095.c: For Epiphany, add -mshort-calls. - * gcc.dg/tree-ssa/loop-1.c: Likewise. + * gcc.dg/tree-ssa/loop-1.c: Likewise. * gcc.dg/torture/pr37868.c: Disable for epiphany. * gcc.dg/sibcall-6.c: Enable for epiphany. diff --git a/gcc/testsuite/g++.dg/conversion/ambig2.C b/gcc/testsuite/g++.dg/conversion/ambig2.C new file mode 100644 index 00000000000..a9d9d699cf0 --- /dev/null +++ b/gcc/testsuite/g++.dg/conversion/ambig2.C @@ -0,0 +1,18 @@ +// PR c++/57948 + +struct Base { }; +struct Derived : Base +{ + struct Derived2 : Base + { + struct ConvertibleToBothDerivedRef + { + operator Derived&(); + operator Derived2&(); + void bind_lvalue_to_conv_lvalue_ambig(ConvertibleToBothDerivedRef both) + { + Base &br1 = both; // { dg-error "ambiguous" } + } + }; + }; +}; -- 2.30.2