From patchwork Fri Mar 21 18:41:05 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: 218 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (caibbdcaaahc.dreamhost.com [208.113.200.72]) by wilcox.dreamhost.com (Postfix) with ESMTP id E0835360103 for ; Fri, 21 Mar 2014 11:41:12 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 9127E41A13406; Fri, 21 Mar 2014 11:41:12 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx20.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-mx20.g.dreamhost.com (Postfix) with ESMTPS id 70ED441A13404 for ; Fri, 21 Mar 2014 11:41:12 -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=rjlkZmWYLd6pbu5MrjjPxXAcnGK7D xDnYxuiFi2GXnR5853guDNpd5R2R9bDpCIztVk/p5/t8xTrPcxFa8y3WlUwqb/WN p975jpCcKC5+mYmmS4CCIhB+WKoHzJE01fFNq0vnl0fQ3v1VwaOiuhfvcb0IgnC3 sZ9ENwqU2BV6o0= 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=C3UFUyr/tOyFYEHalOCeiIRuq0M=; b=OPF WJz2EdroLbbPlp4xqPg9INNyyHJe1ZHwegekp8hqzVHyiNMpeMXOtE5DSAXzfEPF IubjYNFjRP7dKhD+j2X7PLS9bt8QIJ55Zv7Hxny2Sx3+xLy6TGYOX6wGVuGFU9bf x4TZ5qc9JJdbdx9DV2vjiekxDHSphFlWn/GFxTPw= Received: (qmail 13144 invoked by alias); 21 Mar 2014 18:41:11 -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 13132 invoked by uid 89); 21 Mar 2014 18:41:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mail-ee0-f46.google.com Received: from mail-ee0-f46.google.com (HELO mail-ee0-f46.google.com) (74.125.83.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 21 Mar 2014 18:41:09 +0000 Received: by mail-ee0-f46.google.com with SMTP id t10so2121780eei.33 for ; Fri, 21 Mar 2014 11:41:06 -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=NP8U8kos/8Pi2kTS6UivXuIe9fSL3NGOnbjeOBjJV5s=; b=itFAJO8zyBpRNUTUPi4Dk2nmdX/v09C9VtgOs+uf/TqJZbToUSNCaY5CyueRxKqvmE 9LRtRm3uxg9xN3myn+6rvBFnSNLbb0RDUmm4HepSl+JY+Rl0WQFy9kLabScNGlbPDxw3 nM7QSSzdvlIL2vomZuxnxL44KoCzwa6q3kMkwzg8SeKBDiXBIW067D7n3RkSLE31+wIb 7lQ1Nd4fsa7/I2Fj7Q+izOzL9gk+Y1A5dBDBMTj1x5m4jJ/RblYsfWMEwVe7chDB3c/j 1U+13r0sDUmjTvxksW7aPFuEfh6pIoFjGao/z+iwPSytEN6SJF1ci0C717l9MeUeo6VI p6gw== X-Gm-Message-State: ALoCoQkVkmakqzKmcq44MJccN/vMA14s5EPXfuqoGirfC4NrCS3zdyzsWPuQZqboUD73x5YLrI6CGDzH0kdLHFLUxKWM34DlBdeqm/2Xm3Z2xNIKo2Vevii9J4nghWOl5xFfZw5kcBnY3sJXSPpakw6yje+a3W5yHJ/8Swd4KVDcK+RgZsA5y/j9hnbAyXEdFFcCUEvAeGMBYUlKWWF4Qy+VW9MAO1OS3Q== MIME-Version: 1.0 X-Received: by 10.14.194.133 with SMTP id m5mr49600815een.38.1395427265967; Fri, 21 Mar 2014 11:41:05 -0700 (PDT) Received: by 10.15.48.194 with HTTP; Fri, 21 Mar 2014 11:41:05 -0700 (PDT) Date: Fri, 21 Mar 2014 11:41:05 -0700 Message-ID: Subject: [PATCH] [python] Fix gdb.Value.dynamic_type for reference values. From: Siva Chandra To: gdb-patches X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in Hi, gdb.Value.dynamic_type is supposed to work for reference and pointer values. However, the value object in the function 'valpy_get_dynamic_type' was being dereferenced using 'value_ind' irrespective of the value type being TYPE_CODE_PTR or TYPE_CODE_REF. This patch fixes that to use 'coerce_ref' for TYPE_CODE_REF values. ChangeLog: 2014-03-21 Siva Chandra Reddy * python/py-value.c (valpy_get_dynamic_type): Use coerce_ref to dereference TYPE_CODE_REF values. testsuite/ * gdb.python/py-value.c: Improve test case. * gdb.python/py-value.exp: Add new test. diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index a118f6c..54da67a 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -309,7 +309,10 @@ valpy_get_dynamic_type (PyObject *self, void *closure) struct value *target; int was_pointer = TYPE_CODE (type) == TYPE_CODE_PTR; - target = value_ind (val); + if (was_pointer) + target = value_ind (val); + else + target = coerce_ref (val); type = value_rtti_type (target, NULL, NULL, NULL); if (type) diff --git a/gdb/testsuite/gdb.python/py-value.c b/gdb/testsuite/gdb.python/py-value.c index 90dc055..4d1c9c6 100644 --- a/gdb/testsuite/gdb.python/py-value.c +++ b/gdb/testsuite/gdb.python/py-value.c @@ -58,6 +58,8 @@ struct Derived : public Base { }; Base *base = new Derived (); +Derived derived; +Base &base_ref = derived; void ptr_ref(int*& rptr_int) { diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp index ed332db..13433fd 100644 --- a/gdb/testsuite/gdb.python/py-value.exp +++ b/gdb/testsuite/gdb.python/py-value.exp @@ -416,6 +416,8 @@ proc test_subscript_regression {exefile lang} { # Likewise. gdb_test "python print (gdb.parse_and_eval('base').dynamic_type)" \ "Derived \[*\]" + gdb_test "python print (gdb.parse_and_eval('base_ref').dynamic_type)" \ + "Derived \[&\]" # A static type case. gdb_test "python print (gdb.parse_and_eval('5').dynamic_type)" \ "int"