From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31448 invoked by alias); 22 Nov 2012 07:33:01 -0000 Received: (qmail 31382 invoked by uid 22791); 22 Nov 2012 07:33:00 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 22 Nov 2012 07:32:55 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1TbRHK-0001jN-GN from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Wed, 21 Nov 2012 23:32:54 -0800 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 21 Nov 2012 23:32:42 -0800 Received: from qiyao.dyndns.org.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.1.289.1; Wed, 21 Nov 2012 23:32:41 -0800 From: Yao Qi To: Subject: [PATCH 4/4] Handle TYPE_CODE_MEMBERPTR Date: Thu, 22 Nov 2012 07:33:00 -0000 Message-ID: <1353569539-744-5-git-send-email-yao@codesourcery.com> In-Reply-To: <1353569539-744-1-git-send-email-yao@codesourcery.com> References: <1353569539-744-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-11/txt/msg00594.txt.bz2 This patch handles TYPE_CODE_MEMBERPTR and fixes this fail, FAIL: gdb.cp/member-ptr.exp: print (diamond.*diamond_pfunc_ptr) (20) gdb: 2012-11-22 Daniel Jacobowitz * eval.c (evaluate_subexp_standard): Handle TYPE_CODE_MEMBERPTR. --- gdb/eval.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 82ea81b..3c8ec55 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1400,6 +1400,19 @@ evaluate_subexp_standard (struct type *expect_type, tem = 2; argvec[1] = arg2; } + else if (TYPE_CODE (type) == TYPE_CODE_MEMBERPTR) + { + /* Now, convert these values to an address. */ + arg2 = value_cast (lookup_pointer_type (TYPE_DOMAIN_TYPE (type)), + arg2); + + mem_offset = value_as_long (arg1); + + arg1 = value_from_pointer (lookup_pointer_type (TYPE_TARGET_TYPE (type)), + value_as_long (arg2) + mem_offset); + arg1 = value_ind (arg1); + tem = 1; + } else error (_("Non-pointer-to-member value used in pointer-to-member " "construct")); -- 1.7.7.6