From patchwork Wed Apr 16 00:50:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Chandra Reddy X-Patchwork-Id: 574 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id CFD81360078 for ; Tue, 15 Apr 2014 17:50:56 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14314964) id 71384491676D; Tue, 15 Apr 2014 17:50:56 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx22.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id 3D4D5491676D for ; Tue, 15 Apr 2014 17:50:56 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:date:message-id:subject:from:to :content-type; q=dns; s=default; b=Kz3RbKhlZPhzI0ajhWrnBhcRQnlRb gpsMikolS0CFW2utqrPnKnaK1crm/IfRtRvSo/birG64TAcXeCQnw5kxSvXSxn19 Q3+aXAzyAxS1IP5khYm5W856D5kb8egjDg5Q26pzlyD9bH+TtCI1MJkMCbCRwNjX OLJS3zdhBCLlBY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:date:message-id:subject:from:to :content-type; s=default; bh=TbasCTLuCmF8eR+L6okiw2oihOk=; b=qNV iZV7uyQ0fLHh+OUu2TZI4C/30ZRJNWMlKPwmYk/LPVbw41woJ4IpKFrd+DnyQqUi kpTlhGsP9PmuBge/r1KjSWljT3yDhSQMB6fAlsvCr67syqgoH0BxJnLD8gQ/Z/PX sTYVma2RKAabCH9sY+78NmjbNOWiyNx8tf3eCv7s= Received: (qmail 31503 invoked by alias); 16 Apr 2014 00:50:54 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 31481 invoked by uid 89); 16 Apr 2014 00:50:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f51.google.com Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 16 Apr 2014 00:50:52 +0000 Received: by mail-wg0-f51.google.com with SMTP id k14so10139353wgh.34 for ; Tue, 15 Apr 2014 17:50:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=NRAH9HGWCCrVEwb7ucWqPFsUPianXus0kkkltFEtV9M=; b=gdg/ZzsyuDNafIOvHxxhnoO+j2sPx7/8ZLLYc1ITqeZnfrTw69yqmA+G8/fIDWD8+r Mj6qzcbbvuC82YaOs6pjBN6DHD2Nrwk2ihbjbMKzJtpmjQM0/xaLX7zZzLv1+dDKHYJU +eo95sAK6FDEgMH9d0B7H8BjQb5LKGQNTSBON5NerIg0/BPS8YzHJhGndVd20WXWcG8Y qyrNogJR8L/zh/QwBNBaAcoxTmgto0jT/Bu9U8pb1beeIt+gq3i+pbgtRTw7+D+SLL1O Y9yzDS9HLTojoWOiN2x1T+fUkeINRK4S4Wamqaw4FMMygsDSkbrA638Sn3YmqtjkG7Yh 2uqw== X-Gm-Message-State: ALoCoQlagEGymkIFHqO4auDOcAb8np+eOiNcSF1UQl4jmogsR6jGsBIOl+pksCfGGYeM9caS82HR1E9tGTDx564W8yesmvMWyQlDLLiwvlbb1VDMgZf//xb9Fi/XLMh5KNi2KKDZKLsQUjN1KuMANlaSlUmkrvplVwyPI8hqWhE8WbI1dTAKADgcoCmvHzresjoMbjimZLEq/msn95lzAg0f/Wf/lnSpGw== MIME-Version: 1.0 X-Received: by 10.194.202.229 with SMTP id kl5mr39702wjc.86.1397609447999; Tue, 15 Apr 2014 17:50:47 -0700 (PDT) Received: by 10.217.51.7 with HTTP; Tue, 15 Apr 2014 17:50:47 -0700 (PDT) Date: Tue, 15 Apr 2014 17:50:47 -0700 Message-ID: Subject: [PING] [PATCH] Fix dynamic_cast operator From: Siva Chandra To: gdb-patches X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in Original post: https://sourceware.org/ml/gdb-patches/2014-04/msg00089.html Rebased patch is attached. ChangeLog: 2014-04-15 Siva Chandra Reddy * valops.c (value_dynamic_cast): Fix mixup between rtti_type and resolved_type. testsuite/ * gdb.cp/casts.exp: Adjust expected result for few tests. diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp index 9122450..dd848db 100644 --- a/gdb/testsuite/gdb.cp/casts.exp +++ b/gdb/testsuite/gdb.cp/casts.exp @@ -151,8 +151,7 @@ gdb_test "print dynamic_cast (derived)" \ "dynamic_cast simple upcast to reference" gdb_test "print dynamic_cast (ad)" \ - " = \\(Derived \\*\\) ${nonzero_hex}( )?" \ - "dynamic_cast simple downcast" + " = \\(Derived \\*\\) ${nonzero_hex}" "dynamic_cast simple downcast" gdb_test "print dynamic_cast (add)" \ " = \\(VirtuallyDerived \\*\\) $nonzero_hex" \ @@ -167,8 +166,7 @@ gdb_test "print dynamic_cast (*ad)" \ "dynamic_cast to reference to non-existing base" gdb_test "print dynamic_cast (add)" \ - " = \\(DoublyDerived \\*\\) ${nonzero_hex}( )?" \ - "dynamic_cast unique downcast" + " = \\(DoublyDerived \\*\\) ${nonzero_hex}" "dynamic_cast unique downcast" gdb_test "print dynamic_cast (add)" \ " = \\(Gamma \\*\\) $nonzero_hex" \ diff --git a/gdb/valops.c b/gdb/valops.c index 7f2d5f0..b68c4e1 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -801,14 +801,14 @@ value_dynamic_cast (struct type *type, struct value *arg) && TYPE_CODE (TYPE_TARGET_TYPE (resolved_type)) == TYPE_CODE_VOID) return value_at_lazy (type, addr); - tem = value_at (type, addr); - type = value_type (tem); + tem = value_at (rtti_type, addr); /* The first dynamic check specified in 5.2.7. */ if (is_public_ancestor (arg_type, TYPE_TARGET_TYPE (resolved_type))) { if (class_types_same_p (rtti_type, TYPE_TARGET_TYPE (resolved_type))) - return tem; + return value_from_pointer (type, addr); + result = NULL; if (dynamic_cast_check_1 (TYPE_TARGET_TYPE (resolved_type), value_contents_for_printing (tem),