From patchwork Thu Jul 29 13:04:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 60258 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]) by ozlabs.org (Postfix) with SMTP id 819B3B70C1 for ; Thu, 29 Jul 2010 23:02:04 +1000 (EST) Received: (qmail 29380 invoked by alias); 29 Jul 2010 13:02:01 -0000 Received: (qmail 29066 invoked by uid 22791); 29 Jul 2010 13:01:58 -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; Thu, 29 Jul 2010 13:01:53 +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 o6TD1q4l026642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 29 Jul 2010 09:01:52 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [10.16.42.4]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6TD1p5f015598 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 29 Jul 2010 09:01:52 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [127.0.0.1]) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4) with ESMTP id o6TD4LVc014242; Thu, 29 Jul 2010 15:04:21 +0200 Received: (from jakub@localhost) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4/Submit) id o6TD4LSC014240; Thu, 29 Jul 2010 15:04:21 +0200 Date: Thu, 29 Jul 2010 15:04:21 +0200 From: Jakub Jelinek To: Jason Merrill Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] Emit DW_AT_object_pointer (PR debug/45110) Message-ID: <20100729130421.GE18378@tyan-ft48-01.lab.bos.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) X-IsSubscribed: yes 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 Hi! This patch ensures that for methods we emit DW_AT_object_pointer attribute referencing the this (self for ObjC) DW_TAG_formal_parameter. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2010-07-29 Jakub Jelinek PR debug/45110 * dwarf2out.c (dwarf_attr_name): Handle DW_AT_object_pointer. (gen_formal_types_die): Add DW_AT_object_pointer in methods. (gen_subprogram_die): Likewise. Remove it when removing declaration's formal parameters. (gen_decl_die): Change return type to dw_die_ref, return what gen_formal_parameter_die returned. Jakub --- gcc/dwarf2out.c.jj 2010-07-28 11:44:24.000000000 +0200 +++ gcc/dwarf2out.c 2010-07-29 10:21:15.000000000 +0200 @@ -6300,7 +6300,7 @@ static int is_redundant_typedef (const_t static bool is_naming_typedef_decl (const_tree); static inline dw_die_ref get_context_die (tree); static void gen_namespace_die (tree, dw_die_ref); -static void gen_decl_die (tree, tree, dw_die_ref); +static dw_die_ref gen_decl_die (tree, tree, dw_die_ref); static dw_die_ref force_decl_die (tree); static dw_die_ref force_type_die (tree); static dw_die_ref setup_namespace_context (tree, dw_die_ref); @@ -6809,6 +6809,8 @@ dwarf_attr_name (unsigned int attr) return "DW_AT_call_file"; case DW_AT_call_line: return "DW_AT_call_line"; + case DW_AT_object_pointer: + return "DW_AT_object_pointer"; case DW_AT_signature: return "DW_AT_signature"; @@ -18371,9 +18373,14 @@ gen_formal_types_die (tree function_or_m parm_die = gen_formal_parameter_die (formal_type, NULL, true /* Emit name attribute. */, context_die); - if ((TREE_CODE (function_or_method_type) == METHOD_TYPE - && link == first_parm_type) - || (arg && DECL_ARTIFICIAL (arg))) + if (TREE_CODE (function_or_method_type) == METHOD_TYPE + && link == first_parm_type) + { + add_AT_flag (parm_die, DW_AT_artificial, 1); + if (dwarf_version >= 3 || !dwarf_strict) + add_AT_die_ref (context_die, DW_AT_object_pointer, parm_die); + } + else if (arg && DECL_ARTIFICIAL (arg)) add_AT_flag (parm_die, DW_AT_artificial, 1); link = TREE_CHAIN (link); @@ -18648,6 +18655,7 @@ gen_subprogram_die (tree decl, dw_die_re cases die that forced declaration die (e.g. TAG_imported_module) is one of the children that we do not want to remove. */ remove_AT (subr_die, DW_AT_declaration); + remove_AT (subr_die, DW_AT_object_pointer); remove_child_TAG (subr_die, DW_TAG_formal_parameter); } else @@ -18886,7 +18894,14 @@ gen_subprogram_die (tree decl, dw_die_re &parm); else if (parm) { - gen_decl_die (parm, NULL, subr_die); + dw_die_ref parm_die = gen_decl_die (parm, NULL, subr_die); + + if (parm == DECL_ARGUMENTS (decl) + && TREE_CODE (TREE_TYPE (decl)) == METHOD_TYPE + && parm_die + && (dwarf_version >= 3 || !dwarf_strict)) + add_AT_die_ref (subr_die, DW_AT_object_pointer, parm_die); + parm = DECL_CHAIN (parm); } @@ -20435,14 +20450,14 @@ gen_namespace_die (tree decl, dw_die_ref /* Generate Dwarf debug information for a decl described by DECL. */ -static void +static dw_die_ref gen_decl_die (tree decl, tree origin, dw_die_ref context_die) { tree decl_or_origin = decl ? decl : origin; tree class_origin = NULL, ultimate_origin; if (DECL_P (decl_or_origin) && DECL_IGNORED_P (decl_or_origin)) - return; + return NULL; switch (TREE_CODE (decl_or_origin)) { @@ -20613,10 +20628,9 @@ gen_decl_die (tree decl, tree origin, dw gen_type_die (TREE_TYPE (TREE_TYPE (decl_or_origin)), context_die); else gen_type_die (TREE_TYPE (decl_or_origin), context_die); - gen_formal_parameter_die (decl, origin, - true /* Emit name attribute. */, - context_die); - break; + return gen_formal_parameter_die (decl, origin, + true /* Emit name attribute. */, + context_die); case NAMESPACE_DECL: case IMPORTED_DECL: @@ -20629,6 +20643,8 @@ gen_decl_die (tree decl, tree origin, dw gcc_assert ((int)TREE_CODE (decl) > NUM_TREE_CODES); break; } + + return NULL; } /* Output debug information for global decl DECL. Called from toplev.c after