From 9f88ff5a1fedb4ac29628ec421ff0cc613ba6f38 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 1 Jan 2012 20:21:36 +0000 Subject: [PATCH] re PR c++/51379 ([C++0x] [DR 799] reinterpret_cast is not particularly useful) /cp 2012-01-01 Paolo Carlini PR c++/51379 * typeck.c (build_reinterpret_cast_1): Implement resolution of DR 799. /testsuite 2012-01-01 Paolo Carlini PR c++/51379 * g++.dg/conversion/reinterpret4.C: New. * g++.dg/conversion/reinterpret1.C: Adjust. From-SVN: r182775 --- gcc/cp/ChangeLog | 8 +++++++- gcc/cp/typeck.c | 5 +++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/conversion/reinterpret1.C | 2 +- gcc/testsuite/g++.dg/conversion/reinterpret4.C | 4 ++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/conversion/reinterpret4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3d2c5de0791..b4a3df4e4e9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,4 +1,10 @@ -2011-12-31 Fabien Chêne +2012-01-01 Paolo Carlini + + PR c++/51379 + * typeck.c (build_reinterpret_cast_1): Implement resolution of + DR 799. + +2012-01-01 Fabien Chêne * parser.c (cp_parser_using_declaration): Add a warning about deprecated access declarations when no errors were encountered diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index b1689634d59..d9166c933bb 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -6203,6 +6203,11 @@ build_reinterpret_cast_1 (tree type, tree expr, bool c_cast_p, else if (TYPE_PTR_P (type) && INTEGRAL_OR_ENUMERATION_TYPE_P (intype)) /* OK */ ; + else if ((INTEGRAL_OR_ENUMERATION_TYPE_P (type) + || TYPE_PTR_P (type) || TYPE_PTR_TO_MEMBER_P (type)) + && same_type_p (type, intype)) + /* DR 799 */ + return fold_if_not_in_template (build_nop (type, expr)); else if ((TYPE_PTRFN_P (type) && TYPE_PTRFN_P (intype)) || (TYPE_PTRMEMFUNC_P (type) && TYPE_PTRMEMFUNC_P (intype))) return fold_if_not_in_template (build_nop (type, expr)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b4c78d14928..cfbef8d6a83 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-01-01 Paolo Carlini + + PR c++/51379 + * g++.dg/conversion/reinterpret4.C: New. + * g++.dg/conversion/reinterpret1.C: Adjust. + 2012-01-01 Paolo Carlini * g++.dg/cpp0x/constexpr-delegating2.C: Add missing piece. diff --git a/gcc/testsuite/g++.dg/conversion/reinterpret1.C b/gcc/testsuite/g++.dg/conversion/reinterpret1.C index d4567822e2a..aa55f6f4cf5 100644 --- a/gcc/testsuite/g++.dg/conversion/reinterpret1.C +++ b/gcc/testsuite/g++.dg/conversion/reinterpret1.C @@ -3,4 +3,4 @@ struct Y { Y(int &); }; int v; -Y y1(reinterpret_cast(v)); // { dg-error "" } +Y y1(reinterpret_cast(v)); diff --git a/gcc/testsuite/g++.dg/conversion/reinterpret4.C b/gcc/testsuite/g++.dg/conversion/reinterpret4.C new file mode 100644 index 00000000000..71575a1abe5 --- /dev/null +++ b/gcc/testsuite/g++.dg/conversion/reinterpret4.C @@ -0,0 +1,4 @@ +// PR c++/51379 + +unsigned long t1 = 1; +unsigned long t2 = reinterpret_cast(t1); -- 2.30.2