From d780189f23bdad447d7520f46ec1d3258a115d82 Mon Sep 17 00:00:00 2001 From: James Dennett Date: Fri, 12 Nov 2010 18:00:21 +0000 Subject: re PR c++/39415 (static_cast used as downcast can silently lose const) PR c++/39415 * typeck.c (build_static_cast_1): Convert to the target type when doing static_cast(Base*). From-SVN: r166667 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/typeck.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/expr/static_cast7.C | 10 ++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/expr/static_cast7.C (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 53da03c..ef36576 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-11-12 James Dennett + + PR/39415 + * typeck.c (build_static_cast_1): Convert to the target type + when doing static_cast(Base*). + 2010-11-10 Jason Merrill PR c++/46420 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index cad8817..8557ac3 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5884,7 +5884,8 @@ build_static_cast_1 (tree type, tree expr, bool c_cast_p, base = lookup_base (TREE_TYPE (type), TREE_TYPE (intype), c_cast_p ? ba_unique : ba_check, NULL); - return build_base_path (MINUS_EXPR, expr, base, /*nonnull=*/false); + expr = build_base_path (MINUS_EXPR, expr, base, /*nonnull=*/false); + return cp_fold_convert(type, expr); } if ((TYPE_PTRMEM_P (type) && TYPE_PTRMEM_P (intype)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f0f2c98..f372b15 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-12 James Dennett + + PR c++/39415 + * g++.dg/expr/static_cast7.C: New. + 2010-11-12 Rainer Orth * lib/prune.exp (prune_gcc_output): Ignore IRIX 6 linker multiline diff --git a/gcc/testsuite/g++.dg/expr/static_cast7.C b/gcc/testsuite/g++.dg/expr/static_cast7.C new file mode 100644 index 0000000..bced805 --- /dev/null +++ b/gcc/testsuite/g++.dg/expr/static_cast7.C @@ -0,0 +1,10 @@ +// Regression test for bug 39415 (and its duplicate 44916). +struct S {}; +struct T : S {}; +int f(const T*) {} +void f(T*); +int main() { + S* s(0); + int a = f(static_cast(s)); + int b = f(static_cast(0)); +} -- cgit v1.1