From patchwork Thu Oct 10 11:55:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 282222 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 did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 51DD92C032E for ; Thu, 10 Oct 2013 22:56:00 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=oUVYU+c7bYPKPUK1b k+XqOmc0T5IW5gfJc4JRJ40/YgcTL9QEL70KlYnbJd0Q1w3lBisqCX9cJ1n3Iues FR51M+3vIAmySfhGphIoCNqPE0Mm502W9CzFqbJ7A1akUBGQgxnuL3zJD3uc0CZg VMULlMcUGW8RXIqgmv7sWdmnng= 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=8flFXo+J5xSJaGh7Rp4HN2W GH4I=; b=RlSAuB0DLM8UrXYXG35dpCmfxdRXq19lxVJ7N4VOOndbTrD9DjZjug3 pCxxRCOrOcfBkOzuEQ5SeGoCjHR+kPzKxKrXpLlWLPVXb3WpFGyIjhD5PY6XDYRa c96UsMvTjwa2Oynetkmi245+oIUPdoIMs2SH+bKyY0CVwlUajzAU= Received: (qmail 29743 invoked by alias); 10 Oct 2013 11:55:52 -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 29731 invoked by uid 89); 10 Oct 2013 11:55:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 10 Oct 2013 11:55:50 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9ABtmZr012015 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 10 Oct 2013 07:55:48 -0400 Received: from [10.10.53.197] (vpn-53-197.rdu2.redhat.com [10.10.53.197]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9ABtld3021265; Thu, 10 Oct 2013 07:55:47 -0400 Message-ID: <525695C3.5090504@redhat.com> Date: Thu, 10 Oct 2013 07:55:47 -0400 From: Andrew MacLeod User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130805 Thunderbird/17.0.8 MIME-Version: 1.0 To: Jan-Benedict Glaw CC: GCC Patches Subject: Re: [buildrobot] r203314..r203320: ssa / ssanames restructure broke alpha-linux again References: <20130914104154.GH24834@lug-owl.de> <52371678.1000807@redhat.com> <20131010104416.GJ24222@lug-owl.de> In-Reply-To: <20131010104416.GJ24222@lug-owl.de> X-IsSubscribed: yes On 10/10/2013 06:44 AM, Jan-Benedict Glaw wrote: > Hi! > > On Mon, 2013-09-16 10:32:24 -0400, Andrew MacLeod wrote: >> On 09/16/2013 05:05 AM, Richard Biener wrote: >>> On Sat, Sep 14, 2013 at 12:41 PM, Jan-Benedict Glaw wrote: >>>> My Build Robot[1] found this recent commit to break Alpha: >>>> >>>> * tree-flow.h (FREE_SSANAMES): Move to tree-ssanames.c >>>> (SSANAMES, MODIFIED_NORETURN_CALLS, DEFAULT_DEFS, ptr_info_def, >>>> num_ssa_names, ssa_name): Move to tree-ssanames.h + prototypes. >>>> * tree-flow-inline.h (make_ssa_name, copy_ssa_name, duplicate_ssa_name, >>>> make_temp_ssa_name): move to tree-ssanames.h >>>> * tree-ssa-alias.h: Move prototype. >>>> * tree-ssa.h: Include tree-ssanames.h. >>>> * tree-ssanames.c (FREE_SSANAMES): Move to here. >>>> * tree-ssanames.h: New. Move items from tree-flow*.h >>>> * Makefile.in (tree-ssanames.h): Add to tree-ssanames.o and GTFILES. >>>> >>>> See for example this build log: >>>> http://toolchain.lug-owl.de/buildbot/showlog.php?id=11663&mode=view >>>> >>>> I suggest this patch, which fixes an alpha-linux build for me: >>> I think you can remove the tree-flow.h include and you need to update the >>> dependencies in gcc/Makefile.in. >> of course... :-P >> >> I see rs6000.c and i386.c both use tree-flow.h as well. I will >> have to see what they are actually pulling in from that file so I >> don't break those eventually too. > The build robot[1] found a similar problem: > > g++ -c -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -fno-common -DHAVE_CONFIG_H -I. -I. -I../../../../gcc/gcc -I../../../../gcc/gcc/. -I../../../../gcc/gcc/../include -I../../../../gcc/gcc/../libcpp/include -I../../../../gcc/gcc/../libdecnumber -I../../../../gcc/gcc/../libdecnumber/dpd -I../libdecnumber -I../../../../gcc/gcc/../libbacktrace -o alpha.o -MT alpha.o -MMD -MP -MF ./.deps/alpha.TPo ../../../../gcc/gcc/config/alpha/alpha.c > In file included from ../../../../gcc/gcc/config/alpha/alpha.c:53:0: > ../../../../gcc/gcc/config/alpha/alpha.c: In function ‘bool alpha_stdarg_optimize_hook(stdarg_info*, const_gimple)’: > ../../../../gcc/gcc/tree-ssanames.h:62:56: error: invalid use of incomplete type ‘struct gimple_df’ > #define num_ssa_names (vec_safe_length (cfun->gimple_df->ssa_names)) > ^ > ../../../../gcc/gcc/config/alpha/alpha.c:5943:61: note: in expansion of macro ‘num_ssa_names’ > || !bitmap_bit_p (si->va_list_vars, DECL_UID (base) + num_ssa_names)) > ^ > In file included from ../../../../gcc/gcc/expr.h:24:0, > from ../../../../gcc/gcc/config/alpha/alpha.c:36: > ../../../../gcc/gcc/function.h:164:8: error: forward declaration of ‘struct gimple_df’ > struct gimple_df; > ^ > make[2]: *** [alpha.o] Error 1 > > > > r203314 is known-good (http://toolchain.lug-owl.de/buildbot/show_build_details.php?id=16934), > r203320 is known-bad (http://toolchain.lug-owl.de/buildbot/show_build_details.php?id=16956). > > So this is probably uncovered by one of the three large patches in > betwee, which all fight heder file dependencies :) > > MfG, JBG > > [1] http://toolchain.lug-owl.de/buildbot/ > http://toolchain.lug-owl.de/buildbot/timeline.php > Thanks. Just needed to update alpha.c's include file to be able to access num_ssa_names. cross built stage 1 to confirm error and check the change solved the build problem. attached patch checked in as revision 203352 Andrew * config/aplha/alpha.c: Add gimple-ssa.h to include list. Index: config/alpha/alpha.c =================================================================== *** config/alpha/alpha.c (revision 203351) --- config/alpha/alpha.c (working copy) *************** along with GCC; see the file COPYING3. *** 57,62 **** --- 57,63 ---- #include "libfuncs.h" #include "opts.h" #include "params.h" + #include "gimple-ssa.h" /* Specify which cpu to schedule for. */ enum processor_type alpha_tune;