From patchwork Thu Sep 20 20:12:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dehao Chen X-Patchwork-Id: 185478 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 43ABC2C0078 for ; Fri, 21 Sep 2012 06:12:23 +1000 (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=1348776744; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=0AhsPMG 8eSRJlA8yCuM4X3labmw=; b=j15ESS7DE8asfZg3IAFybohTOejtB0PnVI7xujD 25kKmzfZgKprp8+g/+2xfWfkdvz9ZVbTYsHcwzqEgQsxIGwLuQ0ZzdC0YiOr1tPw hhY2HnWyzl7HLhlPqji4aWLZg9sRNDKC/+zW8Qh66ljzm96EuhMgpnzv4yfsns1g 9cuY= 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:X-Google-DKIM-Signature:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Cc:Content-Type:X-System-Of-Record:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=H+CNUARo/rgcpLAoVwz7KRVMsbiONJIOY6x26AARgItfjsTwFFtuecaqZG2Mda /QmDe/HqdSmEUFiJFH02nh71i6xSj2MR/WYPyspjq6UszB3RTI21mvUMbeWABG2U DzGbyAx4OweUhT/orkghdW70NAr2SX2N5mBGbcfLuCIqo=; Received: (qmail 7774 invoked by alias); 20 Sep 2012 20:12:20 -0000 Received: (qmail 7761 invoked by uid 22791); 20 Sep 2012 20:12:17 -0000 X-SWARE-Spam-Status: No, hits=-5.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, TW_TM 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; Thu, 20 Sep 2012 20:12:05 +0000 Received: by pbcwy7 with SMTP id wy7so6278496pbc.20 for ; Thu, 20 Sep 2012 13:12:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :x-system-of-record:x-gm-message-state; bh=pQ+7CviLIXSBaCtHbs7Y7W7R8/S3+SL2fpusG+TyY6k=; b=JvKKy1C056ZYYfUGJRpetDzxD+EpKHO0lAruhCGFyAVcd6lPGtUq6eZPa/ITgLHZb6 DfINYwRjpH3QQgzYg2505BLLnejieX+dIa78YF8K/Ygq+hN0dZo3RCuecKX8lMoADYog 4F1qYs3ubz7t7yfQoYacUu/ffD9nndgvNTacQM5P0j7TvnQxHfx32ePyhjKWdbtGULCk c2IP46BcRQEfaenNnFILWfy4Q4Dn9Av3wGzy4K0MUwdMvOaF1VJDIB60eQtyb9P6Gnnm C2o3OkpcpEyvvg+6HePlb8V0EnTctjgKo2kBz21sMKmbDUT6xQshuT1lfgMGO/svIXei oydg== Received: by 10.68.233.136 with SMTP id tw8mr9618543pbc.133.1348171924741; Thu, 20 Sep 2012 13:12:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.233.136 with SMTP id tw8mr9618523pbc.133.1348171924566; Thu, 20 Sep 2012 13:12:04 -0700 (PDT) Received: by 10.68.200.41 with HTTP; Thu, 20 Sep 2012 13:12:04 -0700 (PDT) Date: Fri, 21 Sep 2012 04:12:04 +0800 Message-ID: Subject: [PATCH] Fix a bug that breaks go build From: Dehao Chen To: GCC Patches Cc: Richard Henderson X-System-Of-Record: true X-Gm-Message-State: ALoCoQkb61cS3wVqaP44p6JHupsmCyTWjQ6iGRIPT1ORPfOcY1iUMPWOtKzNfByPrPq0xlZxrPSOz92i6KpqX7sXOrsBe+s34Ur/6U4kb1LU0NiI3y52ACAlEwzfm6jbahoTuVcdLGlPFTNunQuCKUE23jqGax+aP0U72ygHSdhxYtdp/aR6ZSKu7vkkKF9TBn04MHGB6qtH 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 This patch fixes a bug is in tree-eh.c. IS_UNKNOWN_LOCATION is mistakenly used, thus the block info for a call stmt is cleared. Bootstrapped and gcc regression testing is on-going. Is it okay for trunk? Thanks, Dehao gcc/ChangeLog: tree-eh.c (lower_try_finally_dup_block): Use correct way to check unknown location. Index: tree-eh.c =================================================================== --- tree-eh.c (revision 191494) +++ tree-eh.c (working copy) @@ -883,7 +883,7 @@ lower_try_finally_dup_block (gimple_seq seq, struc new_seq = copy_gimple_seq_and_replace_locals (seq); for (gsi = gsi_start (new_seq); !gsi_end_p (gsi); gsi_next (&gsi)) - if (IS_UNKNOWN_LOCATION (gimple_location (gsi_stmt (gsi)))) + if (gimple_location (gsi_stmt (gsi)) == UNKNOWN_LOCATION) gimple_set_location (gsi_stmt (gsi), loc); if (outer_state->tf)