From patchwork Sat Jun 16 11:32:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 165290 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 42385B70F0 for ; Sat, 16 Jun 2012 21:33:21 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1340451202; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=O0JUxGg LVwfBU3AxZFeJETGbX10=; b=NJCNWUtyIXTEHTWTS/IWiEIar1t9Fr5DnDqxM1/ yAWjsg3e/EPRrfMGZ/b8UZYYkVLk/XqPoq7sAKx+Mx9L92BMSYNVHlcHUXM/kuHb nipSuTW/eWsMugdf6qeVi959Y6lc+FciD1RSKlDioZZSP9drNySET6wSeaNRNMUI 5TTI= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=skUW8ORKSmZU+ZcFEuN/0kPPDEmP3Ydgp8AkfL8uGaTJGEbcyHjlH/N4GDFTmb SNOli+XozXXZqvhrEPL41LFmX26gnJupKeDTlQSBkTQabVJwSpKN++Y6mknjKw7O vZC8l4sdMoNjOy9T7rW3lw07mi9wv2JqvlOf+zeG7VHa8=; Received: (qmail 5777 invoked by alias); 16 Jun 2012 11:33:14 -0000 Received: (qmail 5759 invoked by uid 22791); 16 Jun 2012 11:33:13 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mx02.qsc.de (HELO mx02.qsc.de) (213.148.130.14) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 16 Jun 2012 11:33:00 +0000 Received: from [192.168.178.22] (port-92-204-89-101.dynamic.qsc.de [92.204.89.101]) by mx02.qsc.de (Postfix) with ESMTP id 7496A27C56; Sat, 16 Jun 2012 13:32:57 +0200 (CEST) Message-ID: <4FDC6EE9.5060800@net-b.de> Date: Sat, 16 Jun 2012 13:32:57 +0200 From: Tobias Burnus User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120601 Thunderbird/13.0 MIME-Version: 1.0 To: gcc patches , gfortran Subject: [Patch, Fortran] PRs - fix TRANSFER checks 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 Two rather simple patches. Build and regtested on x86-64-linux. As one of the issues is a 4.7/4.8 regression: OK for the trunk and 4.7? Tobias 2012-06-16 Tobias Burnus PR fortran/53691 PR fortran/53685 * check.c (gfc_calculate_transfer_sizes): Return if SIZE= is not constant or source-size cannot be determined. 2012-06-16 Tobias Burnus PR fortran/53691 PR fortran/53685 * gfortran.dg/transfer_check_3.f90: New. diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 9926f05..9be8f66 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -3986,7 +3986,6 @@ gfc_try gfc_calculate_transfer_sizes (gfc_expr *source, gfc_expr *mold, gfc_expr *size, size_t *source_size, size_t *result_size, size_t *result_length_p) - { size_t result_elt_size; mpz_t tmp; @@ -3995,12 +3994,17 @@ gfc_calculate_transfer_sizes (gfc_expr *source, gfc_expr *mold, gfc_expr *size, if (source->expr_type == EXPR_FUNCTION) return FAILURE; - /* Calculate the size of the source. */ + if (size && size->expr_type != EXPR_CONSTANT) + return FAILURE; + + /* Calculate the size of the source. */ if (source->expr_type == EXPR_ARRAY && gfc_array_size (source, &tmp) == FAILURE) return FAILURE; *source_size = gfc_target_expr_size (source); + if (*source_size == 0) + return FAILURE; mold_element = mold->expr_type == EXPR_ARRAY ? gfc_constructor_first (mold->value.constructor)->expr --- /dev/null 2012-06-16 07:44:03.623809858 +0200 +++ gcc/gcc/testsuite/gfortran.dg/transfer_check_3.f90 2012-06-16 13:28:12.000000000 +0200 @@ -0,0 +1,33 @@ +! { dg-do compile } +! { dg-options "-Wsurprising" } +! +! PR fortran/53691 +! PR fortran/53685 +! +! TRANSFER checks + + +! (a) PR 53691 +! Failed for -Wsurprising with an ICE as SIZE was assumed to be constant + + SUBROUTINE CGBRFSX(N, RWORK) + INTEGER N + REAL RWORK(*) + REAL ZERO + PARAMETER (ZERO = 0.0E+0) + call foo(TRANSFER (RWORK(1:2*N), (/ (ZERO, ZERO) /), N)) + end + +! (b) PR 53685 +! Failed with a bogus size warning if the source's size is not known at compile +! time (for substrings, the length wasn't set) + + subroutine test(j) + implicit none + character(len=4) :: record_type + integer :: i, j + + i = transfer (record_type, i) ! no warning + i = transfer (record_type(1:4), i) ! gave a warning + i = transfer (record_type(1:j), i) ! gave a warning + end