From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21039 invoked by alias); 13 Feb 2014 05:48:22 -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 21026 invoked by uid 89); 13 Feb 2014 05:48:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,RCVD_IN_SEMBACKSCATTER,RP_MATCHES_RCVD autolearn=ham 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 (AES256-SHA encrypted) ESMTPS; Thu, 13 Feb 2014 05:48:21 +0000 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 13 Feb 2014 05:48:17 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 13 Feb 2014 05:48:17 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 148F32190056 for ; Thu, 13 Feb 2014 05:48:14 +0000 (GMT) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1D5m4Wb60358902 for ; Thu, 13 Feb 2014 05:48:04 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1D5mGvv016928 for ; Thu, 13 Feb 2014 00:48:16 -0500 Received: from bl3ahm9f.de.ibm.com (dyn-9-152-212-25.boeblingen.de.ibm.com [9.152.212.25]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s1D5mFtk016925 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Thu, 13 Feb 2014 00:48:16 -0500 Received: from dvogt by bl3ahm9f.de.ibm.com with local (Exim 4.76) (envelope-from ) id 1WDp9j-0000nT-JM; Thu, 13 Feb 2014 06:48:15 +0100 Date: Thu, 13 Feb 2014 05:48:00 -0000 From: Dominik Vogt To: gcc-patches@gcc.gnu.org Cc: rsandifo@linux.vnet.ibm.com, Andreas Krebbel Subject: Re: [PATCH] S390: Fix crash with -mhotpatch and gfortran Message-ID: <20140213054815.GA3031@linux.vnet.ibm.com> Reply-To: vogt@linux.vnet.ibm.com References: <20140212102838.GA10947@linux.vnet.ibm.com> <8761okd0p3.fsf@sandifor-thinkpad.stglab.manchester.uk.ibm.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="UugvWAfsgieZRqgk" Content-Disposition: inline In-Reply-To: <8761okd0p3.fsf@sandifor-thinkpad.stglab.manchester.uk.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14021305-5024-0000-0000-000008B9BCB3 X-SW-Source: 2014-02/txt/msg00817.txt.bz2 --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 990 On Wed, Feb 12, 2014 at 11:34:16AM +0000, Richard Sandiford wrote: > Dominik Vogt writes: > > diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c > > index 32a25a4..9ae8ffd 100644 > > --- a/gcc/config/s390/s390.c > > +++ b/gcc/config/s390/s390.c > > @@ -5510,9 +5510,8 @@ s390_asm_output_function_label (FILE *asm_out_file, const char *fname, > > if (hotpatch_trampoline_halfwords >= 0 > > && decl_function_context (decl) != NULL_TREE) > > { > > - warning_at (0, DECL_SOURCE_LOCATION (decl), > > - "hotpatch_prologue is not compatible with nested" > > - " function"); > > + warning_at (0, OPT_mhotpatch, > > + "hotpatching is not compatible with nested functions"); > > Looks like this should be: > > warning_at (DECL_SOURCE_LOCATION (decl), OPT_mhotpatch, > "hotpatching is not compatible with nested functions"); Yep, see updated patch. Thanks. Ciao Dominik ^_^ ^_^ -- Dominik Vogt IBM Germany --UugvWAfsgieZRqgk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="gcc-4.9-2-0001-S390-Fix-crash-when-mhotpatch-encounters-nested-func.patch" Content-length: 1001 >From b5c24ad50180da2ac31be5c6c3d5fb827c8ab8ed Mon Sep 17 00:00:00 2001 From: Dominik Vogt Date: Wed, 12 Feb 2014 05:53:34 +0000 Subject: [PATCH 1/2] S390: Fix crash when -mhotpatch encounters nested functions (e.g. with gfortran). --- gcc/config/s390/s390.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 32a25a4..ec88bf1 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -5510,9 +5510,8 @@ s390_asm_output_function_label (FILE *asm_out_file, const char *fname, if (hotpatch_trampoline_halfwords >= 0 && decl_function_context (decl) != NULL_TREE) { - warning_at (0, DECL_SOURCE_LOCATION (decl), - "hotpatch_prologue is not compatible with nested" - " function"); + warning_at (DECL_SOURCE_LOCATION (decl), OPT_mhotpatch, + "hotpatching is not compatible with nested functions"); hotpatch_trampoline_halfwords = -1; } } -- 1.8.3.1 --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="gcc-4.9-2-ChangeLog" Content-length: 225 2014-02-12 Dominik Vogt * config/s390/s390.c (s390_asm_output_function_label): fix crash caused by bad second argument to warning_at() with -mhotpatch and nested functions (e.g. with gfortran) --UugvWAfsgieZRqgk--