From patchwork Thu Jul 15 16:39:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 58993 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 4B619B6F11 for ; Fri, 16 Jul 2010 02:39:43 +1000 (EST) Received: (qmail 20640 invoked by alias); 15 Jul 2010 16:39:41 -0000 Received: (qmail 20630 invoked by uid 22791); 15 Jul 2010 16:39:40 -0000 X-SWARE-Spam-Status: No, hits=-5.2 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, 15 Jul 2010 16:39:37 +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 o6FGdalc029689 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 15 Jul 2010 12:39:36 -0400 Received: from anchor.twiddle.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6FGdZUv021815 for ; Thu, 15 Jul 2010 12:39:35 -0400 Message-ID: <4C3F39C7.2070205@redhat.com> Date: Thu, 15 Jul 2010 09:39:35 -0700 From: Richard Henderson 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: GCC Patches Subject: Finish cleanup after creating cdtor 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 A patchlet from the emutls rewrite. Committed. r~ commit 3bf3b560957127a32fe843e8cbbede61c9565afe Author: Richard Henderson Date: Tue Jul 13 10:57:09 2010 -0700 Finish zeroing out the current function status after building cdtor. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2e80e69..087e751 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-07-15 Richard Henderson + + * cgraphunit.c (cgraph_build_static_cdtor): Clear current_function_decl + when done. + 2010-07-15 Jan Hubicka * lto-symtab.c (lto_symtab_resolve_symbols): Remove hack handling comdats diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 2367067..47f8f76 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -2064,7 +2064,9 @@ cgraph_build_static_cdtor (char which, tree body, int priority) cgraph_add_new_function (decl, false); cgraph_mark_needed_node (cgraph_node (decl)); + set_cfun (NULL); + current_function_decl = NULL; } void