From patchwork Wed Dec 15 20:23:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 75680 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]) by ozlabs.org (Postfix) with SMTP id 69D001007D9 for ; Thu, 16 Dec 2010 07:23:38 +1100 (EST) Received: (qmail 20202 invoked by alias); 15 Dec 2010 20:23:35 -0000 Received: (qmail 20185 invoked by uid 22791); 15 Dec 2010 20:23:34 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, TW_TM, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 15 Dec 2010 20:23:29 +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.13.8/8.13.8) with ESMTP id oBFKNRQd011996 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 15 Dec 2010 15:23:27 -0500 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [10.16.42.4]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBFKNQwc001661 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 15 Dec 2010 15:23:27 -0500 Received: from tyan-ft48-01.lab.bos.redhat.com (localhost.localdomain [127.0.0.1]) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4) with ESMTP id oBFKNQj6008041; Wed, 15 Dec 2010 21:23:26 +0100 Received: (from jakub@localhost) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4/Submit) id oBFKNQNZ008040; Wed, 15 Dec 2010 21:23:26 +0100 Date: Wed, 15 Dec 2010 21:23:26 +0100 From: Jakub Jelinek To: Janne Blomqvist Cc: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org Subject: Re: [PATCH] Use size_type_node instead of sizetype for stride overflow checking (PR fortran/46945) Message-ID: <20101215202326.GM27214@tyan-ft48-01.lab.bos.redhat.com> Reply-To: Jakub Jelinek References: <20101215180451.GL27214@tyan-ft48-01.lab.bos.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes 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 On Wed, Dec 15, 2010 at 08:22:20PM +0200, Janne Blomqvist wrote: > You've converted size_zero_node into build_int_cst (size_type_node, > 0), but you missed one case, so I presume you'd want Thanks for catching it up. This is what I've actually committed (note, I've also added cond temporary so that the 80 chars length limit wouldn't be so big issue: Jakub --- fortran/ChangeLog (revision 167870) +++ fortran/ChangeLog (working copy) @@ -1,3 +1,11 @@ +2010-12-15 Jakub Jelinek + + PR fortran/46945 + * trans-array.c (gfc_array_init_size): Perform stride overflow + checking and multiplication by element_size in size_type_node instead + of sizetype, return value with size_type_node type instead of + sometimes with sizetype and sometimes with gfc_array_index_type. + 2010-12-15 Janne Blomqvist * trans.c (gfc_allocate_with_status): Better error message for --- testsuite/ChangeLog (revision 167870) +++ testsuite/ChangeLog (working copy) @@ -1,5 +1,8 @@ 2010-12-15 Jakub Jelinek + PR fortran/46945 + * gfortran.dg/pr46945.f90: New test. + PR debug/46815 * g++.dg/guality/pr46815.C: New test. --- fortran/trans-array.c (revision 167870) +++ fortran/trans-array.c (working copy) @@ -4006,6 +4006,7 @@ gfc_array_init_size (tree descriptor, in tree or_expr; tree thencase; tree elsecase; + tree cond; tree var; stmtblock_t thenblock; stmtblock_t elseblock; @@ -4091,17 +4092,15 @@ gfc_array_init_size (tree descriptor, in fold_convert (gfc_array_index_type, TYPE_MAX_VALUE (gfc_array_index_type)), size); - tmp = fold_build3_loc - (input_location, COND_EXPR, integer_type_node, - gfc_unlikely (fold_build2_loc (input_location, LT_EXPR, - boolean_type_node, tmp, stride)), - integer_one_node, integer_zero_node); - tmp = fold_build3_loc - (input_location, COND_EXPR, integer_type_node, - gfc_unlikely (fold_build2_loc (input_location, EQ_EXPR, - boolean_type_node, size, - build_zero_cst (gfc_array_index_type))), - integer_zero_node, tmp); + cond = gfc_unlikely (fold_build2_loc (input_location, LT_EXPR, + boolean_type_node, tmp, stride)); + tmp = fold_build3_loc (input_location, COND_EXPR, integer_type_node, cond, + integer_one_node, integer_zero_node); + cond = gfc_unlikely (fold_build2_loc (input_location, EQ_EXPR, + boolean_type_node, size, + gfc_index_zero_node)); + tmp = fold_build3_loc (input_location, COND_EXPR, integer_type_node, cond, + integer_zero_node, tmp); tmp = fold_build2_loc (input_location, PLUS_EXPR, integer_type_node, *overflow, tmp); *overflow = gfc_evaluate_now (tmp, pblock); @@ -4154,31 +4153,29 @@ gfc_array_init_size (tree descriptor, in size of an element to get the total size. */ tmp = TYPE_SIZE_UNIT (gfc_get_element_type (type)); /* Convert to size_t. */ - element_size = fold_convert (sizetype, tmp); - stride = fold_convert (sizetype, stride); + element_size = fold_convert (size_type_node, tmp); + stride = fold_convert (size_type_node, stride); /* First check for overflow. Since an array of type character can have zero element_size, we must check for that before dividing. */ tmp = fold_build2_loc (input_location, TRUNC_DIV_EXPR, - sizetype, - TYPE_MAX_VALUE (sizetype), element_size); - tmp = fold_build3_loc (input_location, COND_EXPR, integer_type_node, - gfc_unlikely (fold_build2_loc (input_location, LT_EXPR, - boolean_type_node, tmp, - stride)), + size_type_node, + TYPE_MAX_VALUE (size_type_node), element_size); + cond = gfc_unlikely (fold_build2_loc (input_location, LT_EXPR, + boolean_type_node, tmp, stride)); + tmp = fold_build3_loc (input_location, COND_EXPR, integer_type_node, cond, integer_one_node, integer_zero_node); - tmp = fold_build3_loc (input_location, COND_EXPR, integer_type_node, - gfc_unlikely (fold_build2_loc (input_location, EQ_EXPR, - boolean_type_node, - element_size, - size_zero_node)), + cond = gfc_unlikely (fold_build2_loc (input_location, EQ_EXPR, + boolean_type_node, element_size, + build_int_cst (size_type_node, 0))); + tmp = fold_build3_loc (input_location, COND_EXPR, integer_type_node, cond, integer_zero_node, tmp); tmp = fold_build2_loc (input_location, PLUS_EXPR, integer_type_node, *overflow, tmp); *overflow = gfc_evaluate_now (tmp, pblock); - size = fold_build2_loc (input_location, MULT_EXPR, sizetype, + size = fold_build2_loc (input_location, MULT_EXPR, size_type_node, stride, element_size); if (poffset != NULL) @@ -4190,11 +4187,11 @@ gfc_array_init_size (tree descriptor, in if (integer_zerop (or_expr)) return size; if (integer_onep (or_expr)) - return gfc_index_zero_node; + return build_int_cst (size_type_node, 0); var = gfc_create_var (TREE_TYPE (size), "size"); gfc_start_block (&thenblock); - gfc_add_modify (&thenblock, var, size_zero_node); + gfc_add_modify (&thenblock, var, build_int_cst (size_type_node, 0)); thencase = gfc_finish_block (&thenblock); gfc_start_block (&elseblock); --- testsuite/gfortran.dg/pr46945.f90 (revision 0) +++ testsuite/gfortran.dg/pr46945.f90 (revision 0) @@ -0,0 +1,10 @@ +! PR fortran/46945 +! { dg-do run } +! { dg-options "-O -ftree-vrp -fno-tree-ccp -fno-tree-fre" } + +program pr46945 + real, allocatable :: a(:,:,:) + integer :: n + n = 0 + allocate (a(n,n,n)) +end program pr46945