From patchwork Wed Oct 24 14:50:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 193819 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 532CC2C0109 for ; Thu, 25 Oct 2012 01:50:27 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1351695027; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Cc:Subject:Message-ID: Mail-Followup-To:References:MIME-Version:Content-Type: Content-Disposition:In-Reply-To:User-Agent:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=pXtqrV9xnCDu20y6I3ZCSm+CAVA=; b=De3rX5VwKE2FFm73vr5ZJQVUwaUjB/SsYjK+AIkS4/WHUjbxN/BblebEEzd1BZ paiwly2FDX/ivTFIf6+WstHAtWY6B4QSLbBRFxhybZ0RzZb2ggEwOToDbVXV1CPb 23EuZ/aQYrBcpMdBOUklbZp76WE9mwp2R4KsXGl+GJiHk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:Mail-Followup-To:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=MKiSkYl4yQn5QqokeOM7OsIZ/oBznAheIpwVnGCrnbhyHslS7m2LeWnaT5TplM MUdBf1GS/cJeSQpFMiX1z0EBOoruxEovGGI1LOtDHBDMinfV9uyFz3nc94//j4wM IqmndG8mN3V2OgsblXpXt3+69sPEXqgNuBTxpUjvC1yO0=; Received: (qmail 20446 invoked by alias); 24 Oct 2012 14:50:18 -0000 Received: (qmail 20422 invoked by uid 22791); 24 Oct 2012 14:50:16 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_BG X-Spam-Check-By: sourceware.org Received: from mail-pb0-f47.google.com (HELO mail-pb0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 24 Oct 2012 14:50:10 +0000 Received: by mail-pb0-f47.google.com with SMTP id ro12so1206165pbb.20 for ; Wed, 24 Oct 2012 07:50:10 -0700 (PDT) Received: by 10.66.75.132 with SMTP id c4mr44796341paw.2.1351090210290; Wed, 24 Oct 2012 07:50:10 -0700 (PDT) Received: from bubble.grove.modra.org ([101.166.26.37]) by mx.google.com with ESMTPS id it5sm9559824pbc.10.2012.10.24.07.50.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 07:50:09 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 80650EA2F3A; Thu, 25 Oct 2012 01:20:04 +1030 (CST) Date: Thu, 25 Oct 2012 01:20:04 +1030 From: Alan Modra To: Sebastian Huber Cc: GCC Patches Subject: Re: [Patch] Potential fix for PR55033 Message-ID: <20121024145004.GZ3263@bubble.grove.modra.org> Mail-Followup-To: Sebastian Huber , GCC Patches References: <5086C507.5080905@embedded-brains.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5086C507.5080905@embedded-brains.de> User-Agent: Mutt/1.5.21 (2010-09-15) 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 On Tue, Oct 23, 2012 at 06:25:43PM +0200, Sebastian Huber wrote: > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55033 > > This patch fixes my problem, but I am absolutely not sure if this is the > right way. [snip] This is http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9571 all over again. IMHO your patch is not wrong, but a better idea is that if we've used categorize_decl_for_section to choose a section name, then we ought to also use categorize_decl_for_section to choose section flags. My original fix for pr9571 was to pass the decl down to get_named_section. http://gcc.gnu.org/ml/gcc-patches/2004-11/msg02487.html That hit the assert in get_named_section when building libgfortran for ia64, and my knee-jerk patch to fix that was to simply satisfy the assert. After looking at all the target section_type_flags functions, I believe the following is what I should have done way back then. Bootstrapped and regression tested powerpc64-linux. * varasm.c (default_elf_select_section): Move !DECL_P check.. (get_named_section): ..to here before calling get_section_name. Adjust assertion. (default_section_type_flags): Add DECL_P check. * config/i386/winnt.c (i386_pe_section_type_flags): Likewise. * config/rs6000/rs6000.c (rs6000_xcoff_section_type_flags): Likewise. Index: gcc/varasm.c =================================================================== --- gcc/varasm.c (revision 192660) +++ gcc/varasm.c (working copy) @@ -403,12 +403,16 @@ get_named_section (tree decl, const char *name, in { unsigned int flags; - gcc_assert (!decl || DECL_P (decl)); if (name == NULL) - name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl)); + { + gcc_assert (decl && DECL_P (decl) && DECL_SECTION_NAME (decl)); + name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl)); + } flags = targetm.section_type_flags (decl, name, reloc); + if (decl && !DECL_P (decl)) + decl = NULL_TREE; return get_section (name, flags, decl); } @@ -5943,7 +5947,7 @@ default_section_type_flags (tree decl, const char flags |= SECTION_RELRO; } - if (decl && DECL_ONE_ONLY (decl)) + if (decl && DECL_P (decl) && DECL_ONE_ONLY (decl)) flags |= SECTION_LINKONCE; if (decl && TREE_CODE (decl) == VAR_DECL && DECL_THREAD_LOCAL_P (decl)) @@ -6299,8 +6303,6 @@ default_elf_select_section (tree decl, int reloc, gcc_unreachable (); } - if (!DECL_P (decl)) - decl = NULL_TREE; return get_named_section (decl, sname, reloc); } Index: gcc/config/i386/winnt.c =================================================================== --- gcc/config/i386/winnt.c (revision 192660) +++ gcc/config/i386/winnt.c (working copy) @@ -476,7 +476,7 @@ i386_pe_section_type_flags (tree decl, const char flags |= SECTION_PE_SHARED; } - if (decl && DECL_ONE_ONLY (decl)) + if (decl && DECL_P (decl) && DECL_ONE_ONLY (decl)) flags |= SECTION_LINKONCE; /* See if we already have an entry for this section. */ Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 192660) +++ gcc/config/rs6000/rs6000.c (working copy) @@ -25689,7 +25689,7 @@ rs6000_xcoff_section_type_flags (tree decl, const unsigned int flags = default_section_type_flags (decl, name, reloc); /* Align to at least UNIT size. */ - if (flags & SECTION_CODE || !decl) + if ((flags & SECTION_CODE) != 0 || !decl || !DECL_P (decl)) align = MIN_UNITS_PER_WORD; else /* Increase alignment of large objects if not already stricter. */