From patchwork Thu Sep 18 16:42:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 390860 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 292DC140187 for ; Fri, 19 Sep 2014 02:42:26 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; q= dns; s=default; b=HRFTJXh+0yUEXciS5CHhbPTKW3vPaIKX8aCsTstsPUChwh NWR+oC6wvguYWmA8V+mWWuXsLKyW6elo9uxtZbVFGXSP6O7nxNhA6RhqcckR/j/i DuavzsvDX9bPaxx6+3bD3AUoIonIWRN5KNkNd/ytjKedIfeF5k+EH3H0LRkKI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; s= default; bh=Qaksfa5GH/u8OT3XCvbRVlozsHk=; b=LZtj7viuiGsu4wA2dqBV R7UN04VofbGSU/vzddaLTxLoX2qxIA4Mfll2bU+CEB3CeiRoBdn2ZjtfH6qXxIFw wXrqBQqjuSh6UVO5Q7oF95X/uT1MBVxAF2wggjyInqpN+kB1qc+41rgrogZNxZwg FoHoooGCOMCyRZpWTyc57mg= Received: (qmail 22547 invoked by alias); 18 Sep 2014 16:42:19 -0000 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 Received: (qmail 22530 invoked by uid 89); 18 Sep 2014 16:42:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 18 Sep 2014 16:42:18 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8IGgGSX004053 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 18 Sep 2014 12:42:17 -0400 Received: from reynosa.quesejoda.com (vpn-53-127.rdu2.redhat.com [10.10.53.127]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8IGgGse023055 for ; Thu, 18 Sep 2014 12:42:16 -0400 Message-ID: <541B0B67.5090605@redhat.com> Date: Thu, 18 Sep 2014 10:42:15 -0600 From: Aldy Hernandez User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: gcc-patches Subject: [patch] update comments on *_ultimate_origin output_inline_function was removed in tree-ssa times, no sense referencing it a decade later. I still see DECL_ABSTRACT_ORIGIN pointing to itself in some instances, though I haven't tracked down where, so I assume we still need the functionality, just not the comment :). OK for mainline? Aldy commit d51576de0a8450634ff7622e4688fd02fc8fcee9 Author: Aldy Hernandez Date: Thu Sep 18 10:35:30 2014 -0600 * dwarf2out.c (decl_ultimate_origin): Update comment. * tree.c (block_ultimate_origin): Same. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 23a80d8..c65c756 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -3676,8 +3676,7 @@ decl_ultimate_origin (const_tree decl) if (!CODE_CONTAINS_STRUCT (TREE_CODE (decl), TS_DECL_COMMON)) return NULL_TREE; - /* output_inline_function sets DECL_ABSTRACT_ORIGIN for all the - nodes in the function to point to themselves; ignore that if + /* DECL_ABSTRACT_ORIGIN can point to itself; ignore that if we're trying to output the abstract instance of this function. */ if (DECL_ABSTRACT (decl) && DECL_ABSTRACT_ORIGIN (decl) == decl) return NULL_TREE; diff --git a/gcc/tree.c b/gcc/tree.c index d1d67ef..fc544de 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -11554,8 +11554,7 @@ block_ultimate_origin (const_tree block) { tree immediate_origin = BLOCK_ABSTRACT_ORIGIN (block); - /* output_inline_function sets BLOCK_ABSTRACT_ORIGIN for all the - nodes in the function to point to themselves; ignore that if + /* BLOCK_ABSTRACT_ORIGIN can point to itself; ignore that if we're trying to output the abstract instance of this function. */ if (BLOCK_ABSTRACT (block) && immediate_origin == block) return NULL_TREE;