From patchwork Wed Jul 8 11:00:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Krebbel X-Patchwork-Id: 492849 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 976F5140284 for ; Wed, 8 Jul 2015 21:00:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=u7G7X1O8; 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:subject:message-id:mime-version:content-type; q=dns; s= default; b=y5iFQw6uyDnj/UU+8XHY5GI/Z1SA7eDOa0fqgJPL8LAvjgCZSzuyc L1HJ2MPB23zSi1xmEPI7cZd2lG0t6WTZLB5bPEuGKjDc96VifaulaGVq7gXtwwZk hiPlPHrdC54Qe11tV5VzBAz4S6auCQrYI15XzMC8MgOTJJatth4p8E= 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:subject:message-id:mime-version:content-type; s= default; bh=Twrzcx9m0kpXb/0j9ditUAAVGMw=; b=u7G7X1O89JpbYPUla//H 7A2AaWnnwPykeYGd9RwADE9gytFsoUPc5R6i8puDu0maGXsPfvK62CDrIMA223l+ ds7bxE6KF1444sr/WO/5314rVqz+0XqI5mLl+QqJKUJDiOcMc85/mHjkctUgFCoK TDVtsoSgVQUNwgmwzXd+1H4= Received: (qmail 22079 invoked by alias); 8 Jul 2015 11:00:28 -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 22063 invoked by uid 89); 8 Jul 2015 11:00:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: e06smtp11.uk.ibm.com Received: from e06smtp11.uk.ibm.com (HELO e06smtp11.uk.ibm.com) (195.75.94.107) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Wed, 08 Jul 2015 11:00:26 +0000 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 8 Jul 2015 12:00:22 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 8 Jul 2015 12:00:20 +0100 X-MailFrom: krebbel@linux.vnet.ibm.com X-RcptTo: gcc-patches@gcc.gnu.org Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id DBF4517D8042 for ; Wed, 8 Jul 2015 12:01:35 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t68B0JGm35520694 for ; Wed, 8 Jul 2015 11:00:19 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t68B0JtS011559 for ; Wed, 8 Jul 2015 05:00:19 -0600 Received: from bart (dyn-9-152-212-139.boeblingen.de.ibm.com [9.152.212.139]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with SMTP id t68B0I1v011501 for ; Wed, 8 Jul 2015 05:00:18 -0600 Received: by bart (sSMTP sendmail emulation); Wed, 08 Jul 2015 13:00:18 +0200 Date: Wed, 8 Jul 2015 13:00:18 +0200 From: Andreas Krebbel To: gcc-patches@gcc.gnu.org Subject: [Committed] S/390: Remove assertion in s390_init_frame_layout Message-ID: <20150708110018.GA3174@maggie> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15070811-0041-0000-0000-00000504ED96 X-IsSubscribed: yes Hi, since r225260 the backend register elimination hooks also get invoked after reload is completed e.g. from sched2. During register elimination we call s390_init_frame_layout which is not supposed to be invoked after reload. We had an assertion here to make sure this does not happen. This got triggered and currently breaks bootstrap on S/390. With the attached patch s390_init_frame_layout just becomes a NOP when invoked after reload is completed. Committed to mainline. Bye, -Andreas- gcc/ChangeLog: 2015-07-08 Andreas Krebbel * config/s390/s390.c (s390_init_frame_layout): Replace assertion with early exit. diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 4ef8e42..5715d89 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -9351,7 +9351,10 @@ s390_init_frame_layout (void) HOST_WIDE_INT frame_size; int base_used; - gcc_assert (!reload_completed); + /* After LRA the frame layout is supposed to be read-only and should + not be re-computed. */ + if (reload_completed) + return; /* On S/390 machines, we may need to perform branch splitting, which will require both base and return address register. We have no