From patchwork Thu Jun 13 00:49:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 250941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 225A72C008F for ; Thu, 13 Jun 2013 10:49:42 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=WxGevS9szNRM6BiiZ07hmY/Z/bRjeueHEwMQXme5XXW zskeutAjg+n2HdBVJxpbg5qidCvbACDmmhA4qJu1m8LDx/U7HWLDfvwbYiuLuIcs zYrdP0nWD1AS7g0i/4QLAbXlMCGBeqJAWjfzouAf2a9yCN+WJPWR0qXSnhozoiCA = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=Rbi+eJB7DYvgud013Z71uwUlp7Q=; b=DH6/UadrR02+aJnAa nk016s33JbAsfpYPXhFwfEMeLf/DTKv5rmNsM4mTK/oBytgLX2RzqliNdr0CT+XS 7ITaYGxGnfU5KKOtgX+eaguLDnYsO38LhjBeCY1Jqi33NB8MrDOSwN/2ZcUVuVwv HW8NOPxPjArSlIkG2xOb+054GI= Received: (qmail 9081 invoked by alias); 13 Jun 2013 00:49:36 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 9072 invoked by uid 89); 13 Jun 2013 00:49:35 -0000 X-Spam-SWARE-Status: No, score=-5.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, SPF_PASS, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 13 Jun 2013 00:49:35 +0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r5D0nWQ6010314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Jun 2013 00:49:33 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r5D0nUsg006103 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 13 Jun 2013 00:49:31 GMT Received: from abhmt103.oracle.com (abhmt103.oracle.com [141.146.116.55]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r5D0nUJh019161; Thu, 13 Jun 2013 00:49:30 GMT Received: from poldo4.casa (/79.47.195.90) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 12 Jun 2013 17:49:30 -0700 Message-ID: <51B91718.2010900@oracle.com> Date: Thu, 13 Jun 2013 02:49:28 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Jason Merrill Subject: [C++ Patch] PR 57599 X-Virus-Found: No Hi, this dynamic_cast bug, which just came in, notices that in the simple case of static conversion we forget to perform the cv-qualifier conversions. It seems to me that we are missing a build_nop. I extended quite a bit the testcase, to references too, because at some point I got those wrong ;) Tested x86_64-linux. Thanks, Paolo. ////////////////////////// /cp 2013-06-13 Paolo Carlini PR c++/57599 * rtti.c (build_dynamic_cast_1): In case of static conversion, remember to perform the cv-qualifier conversions. /testsuite 2013-06-13 Paolo Carlini PR c++/57599 * g++.dg/rtti/dyncast6.C: New. Index: cp/rtti.c =================================================================== --- cp/rtti.c (revision 200041) +++ cp/rtti.c (working copy) @@ -633,7 +633,8 @@ build_dynamic_cast_1 (tree type, tree expr, tsubst binfo, 0, complain); if (TYPE_PTR_P (exprtype)) expr = rvalue (expr); - return expr; + /* Add any qualifier conversions. */ + return build_nop (type, expr); } } Index: testsuite/g++.dg/rtti/dyncast6.C =================================================================== --- testsuite/g++.dg/rtti/dyncast6.C (revision 0) +++ testsuite/g++.dg/rtti/dyncast6.C (working copy) @@ -0,0 +1,59 @@ +// PR c++/57599 + +class A { }; + +class B : public A { }; + +void p() +{ + B* b; + + A* a1; + a1 = dynamic_cast(b); + a1 = dynamic_cast(b); // { dg-error "invalid" } + a1 = dynamic_cast(b); // { dg-error "invalid" } + a1 = dynamic_cast(b); // { dg-error "invalid" } + + const A* a2; + a2 = dynamic_cast(b); + a2 = dynamic_cast(b); + a2 = dynamic_cast(b); // { dg-error "invalid" } + a2 = dynamic_cast(b); // { dg-error "invalid" } + + volatile A* a3; + a3 = dynamic_cast(b); + a3 = dynamic_cast(b); // { dg-error "invalid" } + a3 = dynamic_cast(b); + a3 = dynamic_cast(b); // { dg-error "invalid" } + + const volatile A* a4; + a4 = dynamic_cast(b); + a4 = dynamic_cast(b); + a4 = dynamic_cast(b); + a4 = dynamic_cast(b); +} + +void r() +{ + B b; + + A& a1 = dynamic_cast(b); + A& a2 = dynamic_cast(b); // { dg-error "invalid" } + A& a3 = dynamic_cast(b); // { dg-error "invalid" } + A& a4 = dynamic_cast(b); // { dg-error "invalid" } + + const A& ca1 = dynamic_cast(b); + const A& ca2 = dynamic_cast(b); + const A& ca3 = dynamic_cast(b); // { dg-error "invalid" } + const A& ca4 = dynamic_cast(b); // { dg-error "invalid" } + + volatile A& va1 = dynamic_cast(b); + volatile A& va2 = dynamic_cast(b); // { dg-error "invalid" } + volatile A& va3 = dynamic_cast(b); + volatile A& va4 = dynamic_cast(b);// { dg-error "invalid" } + + const volatile A& cva1 = dynamic_cast(b); + const volatile A& cva2 = dynamic_cast(b); + const volatile A& cva3 = dynamic_cast(b); + const volatile A& cva4 = dynamic_cast(b); +}