From patchwork Tue Oct 27 12:26:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 536600 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 588B6141369 for ; Tue, 27 Oct 2015 23:26:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=uw/r7PpK; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; q=dns; s= default; b=dMgO62XkEznyWne2hQpYPyOG0whyBFE0OJSvMsbHOfkuQYgfqcKu5 rMKQBeMuP4gvxnTvwZxWuwHjucM2Q85/vJ22j0t+5cId+kurLk1lX1ZbRXpy6rnQ spMDzgx3McwULhxLvN7WfMELsPx+DwFSBD5xHpQ5wyjVdXryZTE7CQ= 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:date :from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=default; bh=6CvmhecNeXyde+dqFWaGuiXL/Ik=; b=uw/r7PpKacGBm41fwCmndTYYw230 RsXuObjKw4ZobaKZZtorEUUITs+2NNBUsVf7n1YKE52dTKO6w7HpeosJgQwR0J9S hj6zNK6LKf/Xg/Lo236x4GXropkhd+Z+cAb014DjR/hW9mCldrmxn95AvuThKENM K8FD/kYTt1Iz6fM= Received: (qmail 46159 invoked by alias); 27 Oct 2015 12:26: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 46143 invoked by uid 89); 27 Oct 2015 12:26:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx2.suse.de Received: from mx2.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, 27 Oct 2015 12:26:34 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A6F9DAC30; Tue, 27 Oct 2015 12:26:33 +0000 (UTC) Date: Tue, 27 Oct 2015 13:26:30 +0100 From: Martin Jambor To: Christophe Lyon Cc: Richard Biener , GCC Patches , Alexandre Oliva Subject: Re: [PR 67794] Also remap SSA_NAMEs defined in ASMs in IPA-SRA Message-ID: <20151027122630.GA2460@virgil.suse.cz> Mail-Followup-To: Christophe Lyon , Richard Biener , GCC Patches , Alexandre Oliva References: <20151008153345.GO7998@virgil.suse.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-IsSubscribed: yes On Tue, Oct 27, 2015 at 09:56:48AM +0100, Christophe Lyon wrote: > Hi Martin, > > After your backport in the gcc-5 branch, I see build failures: > /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c: > In function ‘tree_node* replace_removed_params_ssa_names(tree_node*, > gimple_statement_base**, ipa_parm_adjustment_vec)’: > /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4609: > error: cannot convert ‘gimple_statement_base**’ to > ‘gimple_statement_base*’ for argument ‘2’ to ‘tree_node* > make_ssa_name(tree_node*, gimple_statement_base*)’ > /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c: > In function ‘bool > ipa_sra_modify_function_body(ipa_parm_adjustment_vec)’: > /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4703: > error: cannot convert ‘gphi*’ to ‘gimple_statement_base**’ for > argument ‘2’ to ‘tree_node* > replace_removed_params_ssa_names(tree_node*, gimple_statement_base**, > ipa_parm_adjustment_vec)’ > /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4772: > error: cannot convert ‘gimple_statement_base*’ to > ‘gimple_statement_base**’ for argument ‘2’ to ‘tree_node* > replace_removed_params_ssa_names(tree_node*, gimple_statement_base**, > ipa_parm_adjustment_vec)’ > make[2]: *** [tree-sra.o] Error 1 > > I see this on aarch64* and arm* targets. > > Can you fix this? Oops, I must have mistakenly committed the trunk version to the branch. I have just fixed the problem by committing the following (after checking that tree-sra.c now matches the one I have tested on the branch). Sorry and thanks for reporting, Martin 2015-10-27 Martin Jambor * tree-sra.c (replace_removed_params_ssa_names): Change type of parameter stmt to gimple. Index: gcc/tree-sra.c =================================================================== --- gcc/tree-sra.c (revision 229434) +++ gcc/tree-sra.c (working copy) @@ -4587,7 +4587,7 @@ get_adjustment_for_base (ipa_parm_adjust ADJUSTMENTS is a pointer to a vector of IPA-SRA adjustments. */ static tree -replace_removed_params_ssa_names (tree old_name, gimple *stmt, +replace_removed_params_ssa_names (tree old_name, gimple stmt, ipa_parm_adjustment_vec adjustments) { struct ipa_parm_adjustment *adj;