From patchwork Sat Apr 13 18:12:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Bosscher X-Patchwork-Id: 236385 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 9BA8B2C009D for ; Sun, 14 Apr 2013 04:13:42 +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 :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=dlWrpvEhK7oL9KsnGPgCY/kN6LOcADRnChgJKmvZ++IbXw uCJxbHYG6o/mMEW9voF1ZBgM3ZYx4+jjlteZLTHOH0caes0mU487PNhxYJs5WQhu VFr8wKCDAb+d/+lSkxUxnerWrrBWzKVm9ABj0fGrlUq8xYJ6LU9/HMCzahAR4= 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 :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=zOzm7TDmf0lOInKG0obatfJBMP8=; b=fLuROUBrwLRPco4E3CLR cBbNnL8Jc2pUeTFG7rvPGvqadp0MoZ94UNNB+LUc5GcbFQMYkCs8HFPDRGnTrX4J 8BP9dScjMnjnEDg970Uezr8yNQkeCL/VZ3TjB7Ydvr1HcvC/oO9L7/ev8gjensAr YkHfDjyYroaKdJ6zRI0u9Fk= Received: (qmail 14324 invoked by alias); 13 Apr 2013 18:13:36 -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 14312 invoked by uid 89); 13 Apr 2013 18:13:35 -0000 X-Spam-SWARE-Status: No, score=-4.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE autolearn=ham version=3.3.1 Received: from mail-ve0-f169.google.com (HELO mail-ve0-f169.google.com) (209.85.128.169) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sat, 13 Apr 2013 18:13:35 +0000 Received: by mail-ve0-f169.google.com with SMTP id d10so3327352vea.0 for ; Sat, 13 Apr 2013 11:13:33 -0700 (PDT) X-Received: by 10.52.164.166 with SMTP id yr6mr10276686vdb.37.1365876813267; Sat, 13 Apr 2013 11:13:33 -0700 (PDT) MIME-Version: 1.0 Received: by 10.58.240.13 with HTTP; Sat, 13 Apr 2013 11:12:52 -0700 (PDT) From: Steven Bosscher Date: Sat, 13 Apr 2013 20:12:52 +0200 Message-ID: Subject: [patch] committed: minor sched-int.h and sched-deps.c fixes To: GCC Patches Hello, In sched-deps.c:deps_analyze_insn there's no need to look for EH_REGION notes, they don't exist until just before final. This assert, and some code in alpha.c (PR56858), are the only remaining meaningful references outside final.c In sched-int.h, the header is only non-empty if INSN_SCHEDULING is defined. After "#ifdef INSN_SCHEDULING" the first header included is insn-attr.h - which defines (or not) INSN_SCHEDULING. So move that include outside the "#ifdef INSN_SCHEDULING" guard. Bootstrapped and tested on several targets over the past three weeks. Committed. Ciao! Steven * sched-deps.c (deps_analyze_insn): Do not check for EH_REGION insn notes, they are emitted only just before final. * sched-int.h: Include insn-attr.h before checking INSN_SCHEDULING. Index: sched-deps.c =================================================================== --- sched-deps.c (revision 197944) +++ sched-deps.c (working copy) @@ -3680,12 +3680,6 @@ deps_analyze_insn (struct deps_desc *deps, rtx ins if (sched_deps_info->use_cselib) cselib_process_insn (insn); - /* EH_REGION insn notes can not appear until well after we complete - scheduling. */ - if (NOTE_P (insn)) - gcc_assert (NOTE_KIND (insn) != NOTE_INSN_EH_REGION_BEG - && NOTE_KIND (insn) != NOTE_INSN_EH_REGION_END); - if (sched_deps_info->finish_insn) sched_deps_info->finish_insn (); Index: sched-int.h =================================================================== --- sched-int.h (revision 197944) +++ sched-int.h (working copy) @@ -21,10 +21,10 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_SCHED_INT_H #define GCC_SCHED_INT_H +#include "insn-attr.h" + #ifdef INSN_SCHEDULING -/* For state_t. */ -#include "insn-attr.h" #include "df.h" #include "basic-block.h"