From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27895 invoked by alias); 20 Jul 2010 19:05:43 -0000 Received: (qmail 27885 invoked by uid 22791); 20 Jul 2010 19:05:42 -0000 X-SWARE-Spam-Status: No, hits=-6.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 20 Jul 2010 19:05:35 +0000 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6KJ5YjJ016095 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Jul 2010 15:05:34 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6KJ5XUx010620 for ; Tue, 20 Jul 2010 15:05:34 -0400 Received: from [10.15.16.129] (dhcp-10-15-16-129.yyz.redhat.com [10.15.16.129]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o6KJ5WgD029743 for ; Tue, 20 Jul 2010 15:05:33 -0400 Message-ID: <4C45F37C.1080401@redhat.com> Date: Tue, 20 Jul 2010 19:05:00 -0000 From: sami wagiaalla User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100621 Fedora/3.0.5-1.fc13 Thunderbird/3.0.5 MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: Re: [patch] function eval cleanup References: <4C3B6428.8090906@redhat.com> <4C446F00.5060709@redhat.com> In-Reply-To: <4C446F00.5060709@redhat.com> Content-Type: multipart/mixed; boundary="------------030306010900010601040102" 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: 2010-07/txt/msg00311.txt.bz2 This is a multi-part message in MIME format. --------------030306010900010601040102 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 470 > > In this particular location and if the language is C++ we are dealing > with an OP_VAR_VALUE since all the other constructs were eliminated by > the if else chain. So it is always a symbol, but I could add a check for > OP_VAR_VALUE before skipping evaluation. > Tom pointed out that the catch all is also responsible for evaluating complex expressions describing function pointers. So I added a check for OP_VAR_VALUE, and a test-case for the missed scenario. --------------030306010900010601040102 Content-Type: text/plain; name="overload-cleanup.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="overload-cleanup.patch" Content-length: 4315 Corrected pre-overload-resolution function evaluation. 2010-07-20 Sami Wagiaalla * eval.c (evaluate_subexp_standard): Disabled evaluation of C++ function symbols before overload resolution. 2010-07-20 Sami Wagiaalla * gdb.cp/fpointer.cc: New test. * gdb.cp/fpointer.exp: New test. diff --git a/gdb/eval.c b/gdb/eval.c index 9a60616..ba75952 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1491,19 +1491,29 @@ evaluate_subexp_standard (struct type *expect_type, { /* Non-method function call */ save_pos1 = *pos; - argvec[0] = evaluate_subexp_with_coercion (exp, pos, noside); tem = 1; - type = value_type (argvec[0]); - if (type && TYPE_CODE (type) == TYPE_CODE_PTR) - type = TYPE_TARGET_TYPE (type); - if (type && TYPE_CODE (type) == TYPE_CODE_FUNC) + + /* If this is a C++ function wait until overload resolution. */ + if (op == OP_VAR_VALUE + && overload_resolution + && (exp->language_defn->la_language == language_cplus)) { - for (; tem <= nargs && tem <= TYPE_NFIELDS (type); tem++) + (*pos) += 4; /* Skip the evaluation of the symbol. */ + argvec[0] = NULL; + } + else + { + argvec[0] = evaluate_subexp_with_coercion (exp, pos, noside); + type = value_type (argvec[0]); + if (type && TYPE_CODE (type) == TYPE_CODE_PTR) + type = TYPE_TARGET_TYPE (type); + if (type && TYPE_CODE (type) == TYPE_CODE_FUNC) { - /* pai: FIXME This seems to be coercing arguments before - * overload resolution has been done! */ - argvec[tem] = evaluate_subexp (TYPE_FIELD_TYPE (type, tem - 1), - exp, pos, noside); + for (; tem <= nargs && tem <= TYPE_NFIELDS (type); tem++) + { + argvec[tem] = evaluate_subexp (TYPE_FIELD_TYPE (type, tem - 1), + exp, pos, noside); + } } } } diff --git a/gdb/testsuite/gdb.cp/fpointer.cc b/gdb/testsuite/gdb.cp/fpointer.cc new file mode 100644 index 0000000..007ea39 --- /dev/null +++ b/gdb/testsuite/gdb.cp/fpointer.cc @@ -0,0 +1,40 @@ +#include "stdio.h" + +int foo(){ + return 11; +} + +int bar(){ + return 12; +} + +int bar(int){ + printf ("bar(int)\n"); + return 13; +} + +int bar(char){ + printf ("bar(char)\n"); + return 14; +} + +int (*p1)() = &foo; +int (*p2)() = &bar; +int (*p[2])() = {p1,p2}; + +int (*p3)(int) = &bar; +int (*p4)(char) = &bar; + +int main () +{ + p1 (); + p2 (); + + p[0](); + p[1](); + + p3 ('a'); + p4 (1); + + return 0; +} diff --git a/gdb/testsuite/gdb.cp/fpointer.exp b/gdb/testsuite/gdb.cp/fpointer.exp new file mode 100644 index 0000000..6144bbe --- /dev/null +++ b/gdb/testsuite/gdb.cp/fpointer.exp @@ -0,0 +1,54 @@ +# Copyright 2008, 2010 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This tests for evaluation of functions in the form of +# complex expressions. + +if $tracelevel then { + strace $tracelevel +} + +set testfile fpointer +set srcfile ${testfile}.cc +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \ + {debug c++}] != "" } { + untested "Couldn't compile test program" + return -1 +} + +# Get things started. + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if ![runto_main] then { + perror "couldn't run to breakpoint main" + continue +} + +# Test that function calls done through function pointers +gdb_test "p p1()" "= 11" +gdb_test "p p2()" "= 12" + +gdb_test {p p[0]()} "= 11" +gdb_test {p p[1]()} "= 12" + +# Test that overload resolution is not performed for function +# pointers. +gdb_test "p p3('a')" "= 13" +gdb_test "p p4(1)" "= 14" --------------030306010900010601040102--