From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29735 invoked by alias); 12 Jan 2016 17:05:07 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 29702 invoked by uid 89); 12 Jan 2016 17:05:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 spammy=abstract, Functions, H*r:10.10.1, xxx X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 12 Jan 2016 17:05:05 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 0BCD228FEF3E for ; Tue, 12 Jan 2016 18:05:03 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7pA6klUM3X2P for ; Tue, 12 Jan 2016 18:05:02 +0100 (CET) Received: from [10.10.1.112] (cacatoes.act-europe.fr [10.10.1.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id EF46828FBB88 for ; Tue, 12 Jan 2016 18:05:02 +0100 (CET) From: Pierre-Marie de Rodat Subject: [PATCH] DWARF: add abstract origin links on lexical blocks DIEs To: GCC Patches Message-ID: <5695323E.3030700@adacore.com> Date: Tue, 12 Jan 2016 17:05:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2016-01/txt/msg00750.txt.bz2 Hello, Although the following patch does not fix a regression, I believe it fixes a bug visible from a debugger, so I think it’s a valid candidate at this stage. This change tracks from which abstract lexical block concrete ones come from in DWARF so that debuggers can inherit the former from the latter. This enables debuggers to properly handle the following case: * function Child2 is nested in a lexical block, itself nested in function Child1; * function Child1 is inlined into some call site; * function Child2 is never inlined. Here, Child2 is described in DWARF only in the abstract instance of Child1. So when debuggers decode Child1's concrete instances, they need to fetch the definition for Child2 in the corresponding abstract instance: the DW_AT_abstract_origin link on the lexical block that embeds Child1 enables them to do that. Bootstrapped and regtested on x86_64-linux. Ok to commit? Thank you in advance! gcc/ChangeLog: * dwarf2out.c (add_abstract_origin_attribute): Adjust documentation comment. For BLOCK nodes, add a DW_AT_abstract_origin attribute that points to the DIE generated for the origin BLOCK. (gen_lexical_block_die): Call add_abstract_origin_attribute for blocks from inlined functions. --- gcc/dwarf2out.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index da5524e..a889dbb 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -18463,15 +18463,16 @@ add_prototyped_attribute (dw_die_ref die, tree func_type) } /* Add an 'abstract_origin' attribute below a given DIE. The DIE is found - by looking in either the type declaration or object declaration - equate table. */ + by looking in the type declaration, the object declaration equate table or + the block mapping. */ static inline dw_die_ref add_abstract_origin_attribute (dw_die_ref die, tree origin) { dw_die_ref origin_die = NULL; - if (TREE_CODE (origin) != FUNCTION_DECL) + if (TREE_CODE (origin) != FUNCTION_DECL + && TREE_CODE (origin) != BLOCK) { /* We may have gotten separated from the block for the inlined function, if we're in an exception handler or some such; make @@ -18493,6 +18494,8 @@ add_abstract_origin_attribute (dw_die_ref die, tree origin) origin_die = lookup_decl_die (origin); else if (TYPE_P (origin)) origin_die = lookup_type_die (origin); + else if (TREE_CODE (origin) == BLOCK) + origin_die = BLOCK_DIE (origin); /* XXX: Functions that are never lowered don't always have correct block trees (in the case of java, they simply have no block tree, in some other @@ -21294,6 +21297,10 @@ gen_lexical_block_die (tree stmt, dw_die_ref context_die) BLOCK_DIE (stmt) = stmt_die; old_die = NULL; } + + tree origin = block_ultimate_origin (stmt); + if (origin != NULL_TREE && origin != stmt) + add_abstract_origin_attribute (stmt_die, origin); } if (old_die) -- 2.3.3.199.g52cae64