From patchwork Thu Sep 8 22:34:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Kargl X-Patchwork-Id: 667812 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 3sVZsP5Kptz9s3T for ; Fri, 9 Sep 2016 08:35:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=rPFrf7c1; 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:reply-to:mime-version:content-type; q=dns; s=default; b=lvg8LRKafSUD7ifHwN5cY1XuPzP6bWjR1UORllDMoaa TZ3fNZEts4LiW2S9Zt0/flr8Kb+2lfnkdXJK9N8Q6MBzo2SfgA/mDcVPfV1o7vsY +wGjo7nUkH2dcmvRDX9Lw/1ONhwWOlkKZGtBlpfUXVTiPC6cNT2RFbC9UBZIzfVI = 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:reply-to:mime-version:content-type; s=default; bh=XvJiPCFlb5Tv9TU365zqhYGXn60=; b=rPFrf7c1Ku9GmxFZw 6osFXAFmewtF/WB5qvS5UkjNgZKpMMF5hwBQUtbjKeNKRN5Kw6mCgEdwXAIsQBMn Vj+ip+kyCBiUmP6c2Fdk9XCn6Nfd31/n/vgrE74SwxdDfTfrzV5YH1ZFbxke42lJ uWZPO9Tz5ZbiCIdsU2hxfW350s= Received: (qmail 67254 invoked by alias); 8 Sep 2016 22:34:55 -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 67236 invoked by uid 89); 8 Sep 2016 22:34:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.1 required=5.0 tests=AWL, BAYES_05, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=no version=3.3.2 spammy=mii, *expr, tstype, ts.type X-Spam-User: qpsmtpd, 2 recipients X-HELO: troutmask.apl.washington.edu Received: from troutmask.apl.washington.edu (HELO troutmask.apl.washington.edu) (128.95.76.21) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Sep 2016 22:34:44 +0000 Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.15.2/8.15.2) with ESMTPS id u88MYg6I036747 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 8 Sep 2016 15:34:43 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.15.2/8.15.2/Submit) id u88MYgpr036746; Thu, 8 Sep 2016 15:34:42 -0700 (PDT) (envelope-from sgk) Date: Thu, 8 Sep 2016 15:34:42 -0700 From: Steve Kargl To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [Committed] PR fortran/69514 Message-ID: <20160908223442.GA36714@troutmask.apl.washington.edu> Reply-To: kargl@uw.edu MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) I've committed the attached patch to trunk after completing regression testing on x86_64-*-freebsd. 2016-09-08 Steven G. Kargl PR fortran/69514 * array.c (gfc_match_array_constructor): If type-spec is present, walk the array constructor performing possible conversions for numeric types. 2016-09-08 Steven G. Kargl Louis Krupp PR fortran/69514 * gfortran.dg/pr69514_1.f90: New test. * gfortran.dg/pr69514_2.f90: New test. Index: gcc/fortran/array.c =================================================================== --- gcc/fortran/array.c (revision 240038) +++ gcc/fortran/array.c (working copy) @@ -1089,6 +1089,7 @@ match_array_cons_element (gfc_constructo match gfc_match_array_constructor (gfc_expr **result) { + gfc_constructor *c; gfc_constructor_base head, new_cons; gfc_undo_change_set changed_syms; gfc_expr *expr; @@ -1194,8 +1195,6 @@ done: be converted. See PR fortran/67803. */ if (ts.type == BT_CHARACTER) { - gfc_constructor *c; - c = gfc_constructor_first (head); for (; c; c = gfc_constructor_next (c)) { @@ -1218,6 +1217,14 @@ done: } } } + + /* Walk the constructor and ensure type conversion for numeric types. */ + if (gfc_numeric_ts (&ts)) + { + c = gfc_constructor_first (head); + for (; c; c = gfc_constructor_next (c)) + gfc_convert_type (c->expr, &ts, 1); + } } else expr = gfc_get_array_expr (BT_UNKNOWN, 0, &where); Index: gcc/testsuite/gfortran.dg/pr69514_1.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr69514_1.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr69514_1.f90 (working copy) @@ -0,0 +1,5 @@ +! { dg-do run } +program foo + real, parameter :: x(3) = 2.0 * [real :: 1, 2, 3 ] + if (any(x /= [2., 4., 6.])) call abort +end program foo Index: gcc/testsuite/gfortran.dg/pr69514_2.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr69514_2.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr69514_2.f90 (working copy) @@ -0,0 +1,49 @@ +! { dg-do run } +program p + implicit none + + real , parameter :: arr(3) = [ real :: 2, 2.5, (1.5, 2.5) ] + real , parameter :: ari(3) = [ integer :: 2, 2.5, (1.5, 2.5) ] + real , parameter :: arc(3) = [ complex :: 2, 2.5, (1.5, 2.5) ] + integer, parameter :: air(3) = [ real :: 2, 2.5, (1.5, 2.5) ] + integer, parameter :: aii(3) = [ integer :: 2, 2.5, (1.5, 2.5) ] + integer, parameter :: aic(3) = [ complex :: 2, 2.5, (1.5, 2.5) ] + complex, parameter :: acr(3) = [ real :: 2, 2.5, (1.5, 2.5) ] + complex, parameter :: aci(3) = [ integer :: 2, 2.5, (1.5, 2.5) ] + complex, parameter :: acc(3) = [ complex :: 2, 2.5, (1.5, 2.5) ] + + real , parameter :: mrr(3) = 4.5 * [ real :: 2, 2.5, (3.5, 4.0) ] + real , parameter :: mri(3) = 4.5 * [ integer :: 2, 2.5, (3.5, 4.0) ] + real , parameter :: mrc(3) = 4.5 * [ complex :: 2, 2.5, (3.5, 4.0) ] + integer, parameter :: mir(3) = 4 * [ real :: 2, 2.5, (3.5, 4.0) ] + integer, parameter :: mii(3) = 4 * [ integer :: 2, 2.5, (3.5, 4.0) ] + integer, parameter :: mic(3) = 4 * [ complex :: 2, 2.5, (3.5, 4.0) ] + complex, parameter :: mcr(3) = (4.5, 5.5) * [ real :: 2, 2.5, (3.5, 4.0) ] + complex, parameter :: mci(3) = (4.5, 5.5) * [ integer :: 2, 2.5, (3.5, 4.0) ] + complex, parameter :: mcc(3) = (4.5, 5.5) * [ complex :: 2, 2.5, (3.5, 4.0) ] + + if (any(arr /= [2.00, 2.50, 1.50])) call abort + if (any(ari /= [2.00, 2.00, 1.00])) call abort + if (any(arc /= [2.00, 2.50, 1.50])) call abort + + if (any(air /= [2, 2, 1])) call abort + if (any(aii /= [2, 2, 1])) call abort + if (any(aic /= [2, 2, 1])) call abort + + if (any(acr /= [(2.00, 0.00), (2.50, 0.00), (1.50, 0.00)])) call abort + if (any(aci /= [(2.00, 0.00), (2.00, 0.00), (1.00, 0.00)])) call abort + if (any(acc /= [(2.00, 0.00), (2.50, 0.00), (1.50, 2.50)])) call abort + + if (any(mrr /= [9.00, 11.25, 15.75])) call abort + if (any(mri /= [9.00, 9.00, 13.50])) call abort + if (any(mrc /= [9.00, 11.25, 15.75])) call abort + + if (any(mir /= [8, 10, 14])) call abort + if (any(mii /= [8, 8, 12])) call abort + if (any(mic /= [8, 10, 14])) call abort + + if (any(mcr /= [(9.00, 11.00), (11.25, 13.75), (15.75, 19.25)])) call abort + if (any(mci /= [(9.00, 11.00), ( 9.00, 11.00), (13.50, 16.50)])) call abort + if (any(mcc /= [(9.00, 11.00), (11.25, 13.75), (-6.25, 37.25)])) call abort + +end program p