From 63891ba2ecbef8ad86aa21d2c3682953a9cf6fc8 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 3 Jan 2012 15:29:42 +0000 Subject: [PATCH] re PR c++/29273 (error on dynamic_cast(array)) /cp 2012-01-03 Paolo Carlini PR c++/29273 * rtti.c (build_dynamic_cast_1): In case of T a pointer type, call decay_conversion on v. /testsuite 2012-01-03 Paolo Carlini PR c++/29273 * g++.dg/rtti/dyncast5.C: New. From-SVN: r182851 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/rtti.c | 9 ++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/rtti/dyncast5.C | 9 +++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/rtti/dyncast5.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4f6faf5b806..a5387da23a5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-03 Paolo Carlini + + PR c++/29273 + * rtti.c (build_dynamic_cast_1): In case of T a pointer type, + call decay_conversion on v. + 2012-01-03 Paolo Carlini PR c++/15867 diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 4494fddc03e..30383ed18ad 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -515,7 +515,7 @@ static tree build_dynamic_cast_1 (tree type, tree expr, tsubst_flags_t complain) { enum tree_code tc = TREE_CODE (type); - tree exprtype = TREE_TYPE (expr); + tree exprtype; tree dcast_fn; tree old_expr = expr; const char *errstr = NULL; @@ -551,6 +551,9 @@ build_dynamic_cast_1 (tree type, tree expr, tsubst_flags_t complain) if (tc == POINTER_TYPE) { + expr = decay_conversion (expr); + exprtype = TREE_TYPE (expr); + /* If T is a pointer type, v shall be an rvalue of a pointer to complete class type, and the result is an rvalue of type T. */ @@ -576,7 +579,7 @@ build_dynamic_cast_1 (tree type, tree expr, tsubst_flags_t complain) { expr = mark_lvalue_use (expr); - exprtype = build_reference_type (exprtype); + exprtype = build_reference_type (TREE_TYPE (expr)); /* T is a reference type, v shall be an lvalue of a complete class type, and the result is an lvalue of the type referred to by T. */ @@ -764,7 +767,7 @@ build_dynamic_cast_1 (tree type, tree expr, tsubst_flags_t complain) fail: if (complain & tf_error) error ("cannot dynamic_cast %qE (of type %q#T) to type %q#T (%s)", - expr, exprtype, type, errstr); + old_expr, TREE_TYPE (old_expr), type, errstr); return error_mark_node; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6b7808ab18e..f7ffe363d27 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-03 Paolo Carlini + + PR c++/29273 + * g++.dg/rtti/dyncast5.C: New. + 2012-01-03 Richard Guenther PR tree-optimization/51070 diff --git a/gcc/testsuite/g++.dg/rtti/dyncast5.C b/gcc/testsuite/g++.dg/rtti/dyncast5.C new file mode 100644 index 00000000000..d0d58d0095e --- /dev/null +++ b/gcc/testsuite/g++.dg/rtti/dyncast5.C @@ -0,0 +1,9 @@ +// PR c++/29273 + +struct A { virtual ~A () { } }; +struct B: A { } b [1]; + +void foo () +{ + dynamic_cast(b); +}