From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18684 invoked by alias); 13 Jan 2015 10:11:49 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 18673 invoked by uid 89); 13 Jan 2015 10:11:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx2.suse.de Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Tue, 13 Jan 2015 10:11:47 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 10ECCAB0E; Tue, 13 Jan 2015 10:11:44 +0000 (UTC) Date: Tue, 13 Jan 2015 10:36:00 -0000 From: Richard Biener To: Prathamesh Kulkarni cc: gcc Patches , Michael Collison , Andrew MacLeod , Maxim Kuvyrkov , Jeff Law Subject: Re: flatten expr.h (version 2) In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-SW-Source: 2015-01/txt/msg00810.txt.bz2 On Sun, 11 Jan 2015, Prathamesh Kulkarni wrote: > Hi, > This is a revamped expr.h flattening flattening patch rebased on > tree.h and tree-core.h flattening patch (r219402). > It depends upon the following patch to get committed. > https://gcc.gnu.org/ml/gcc-patches/2015-01/msg00565.html > > Changes: > * Removed all includes except tree-core.h. Put includes required by > expr.h in a comment. > * Moved stmt.c, expmed.c prototypes to stmt.h, expmed.h respectively. > * Adjusted generator programs: genemit.c, gengtype.c, genopinit.c, genoutput.c. > * Did not put includes in gcc-plugin.h since expr.h cannot be included > by plugins > (putting them broke building a file in c-family/ since expr.h is not > allowed in front-ends) > * Affects java front-end (expr.h is allowed in java front-end). > > Bootstrapped and tested on x86_64-unknown-linux-gnu with languages: > all,go,ada,jit > Built on all targets in config-list.mk with languages: all, go. > OK to commit ? diff --git a/gcc/expr.c b/gcc/expr.c index fc22862..824541e 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -41,11 +41,17 @@ along with GCC; see the file COPYING3. If not see #include "regs.h" #include "hard-reg-set.h" #include "except.h" -#include "input.h" #include "function.h" #include "insn-config.h" #include "insn-attr.h" /* Include expr.h after insn-config.h so we get HAVE_conditional_move. */ +#include "hashtab.h" +#include "emit-rtl.h" +#include "expmed.h" +#include "stmt.h" +#include "statistics.h" +#include "real.h" +#include "fixed-value.h" #include "expr.h" Please move the comment to the proper place diff --git a/gcc/expr.h b/gcc/expr.h index a7638b8..f1be8dc 100644 --- a/gcc/expr.h +++ b/gcc/expr.h @@ -20,7 +20,8 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_EXPR_H #define GCC_EXPR_H -/* For inhibit_defer_pop */ +/* expr.h required includes */ +#if 0 #include "hashtab.h" #include "hash-set.h" #include "vec.h" @@ -29,15 +30,17 @@ along with GCC; see the file COPYING3. If not see #include "hard-reg-set.h" #include "input.h" #include "function.h" -/* For XEXP, GEN_INT, rtx_code */ #include "rtl.h" -/* For optimize_size */ #include "flags.h" -/* For tree_fits_[su]hwi_p, tree_to_[su]hwi, fold_convert, size_binop, - ssize_int, TREE_CODE, TYPE_SIZE, int_size_in_bytes, */ #include "tree-core.h" -/* For GET_MODE_BITSIZE, word_mode */ #include "insn-config.h" +#include "alias.h" +#include "emit-rtl.h" +#include "expmed.h" +#include "stmt.h" +#endif Err, please remove the #if 0 section + +#include "tree-core.h" Why? The original comment says -/* For tree_fits_[su]hwi_p, tree_to_[su]hwi, fold_convert, size_binop, - ssize_int, TREE_CODE, TYPE_SIZE, int_size_in_bytes, */ but all those are declared in tree.h. Which means the files including expr.h must already include tree.h. If that's not the reason we need to include tree-core.h from expr.c please add a comment explaining why. -/* Definitions from emit-rtl.c */ -#include "emit-rtl.h" - /* Return a memory reference like MEMREF, but with its mode widened to MODE and adjusted by OFFSET. */ extern rtx widen_memory_access (rtx, machine_mode, HOST_WIDE_INT); err - functions defined in emit-rtl.c should be declared in emit-rtl.h. Please fix that first. expr.h should _only_ contain prototypes for stuff defined in expr.c. Andrew did a good job with this, first cleaning up a header moving declarations to proper places and only after that flattening it. The rest of the patch looks good to me but expr.h isn't in a good shape after it. Thanks, Richard.