From patchwork Tue Dec 26 12:12:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 852962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-469825-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="KpJM+OF4"; dkim-atps=neutral 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 3z5ZdC22Bkz9s7s for ; Tue, 26 Dec 2017 23:13:15 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=IkXB5kxdQkQYV10QwKBK9uuxPsrBvoIol+iCQMhn5ZNxyv5egk 0Nlp911iDTGJarqv5T5dB7Kw8g7x0tuZ8jSxnFyYDTQ4Whkza12HmfptXHSzrJFx JRfZuzElrbrXz5gFFSsIQB8PiiWeoH4vlOmJLB/XLKFkjFwiERZsbDr84= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=HhveJ3Xlv7beVRftb51+HOEscpw=; b=KpJM+OF48v6FFXsv2y8Q OaC9HilY3Q4voSBpRht2zHn0KqNw5h3lFKdi6obQPJSzVbmj80010tCF45mpBgb1 9sWsZrrDqptguqj9h2cmtWsObWFpFoe8i/5RsW40yRuw6Hb0iRyhRlpTrzmdSYa+ 9az9igqH0k56XoxmyIHSQqE= Received: (qmail 81211 invoked by alias); 26 Dec 2017 12:13:05 -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 81172 invoked by uid 89); 26 Dec 2017 12:13:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:1545 X-Spam-User: qpsmtpd, 2 recipients X-HELO: cc-smtpout3.netcologne.de Received: from cc-smtpout3.netcologne.de (HELO cc-smtpout3.netcologne.de) (89.1.8.213) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 26 Dec 2017 12:13:02 +0000 Received: from cc-smtpin3.netcologne.de (cc-smtpin3.netcologne.de [89.1.8.203]) by cc-smtpout3.netcologne.de (Postfix) with ESMTP id 9494712988; Tue, 26 Dec 2017 13:12:58 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin3.netcologne.de (Postfix) with ESMTP id 914E611DE5; Tue, 26 Dec 2017 13:12:58 +0100 (CET) Received: from [78.35.133.210] (helo=cc-smtpin3.netcologne.de) by localhost with ESMTP (eXpurgate 4.1.9) (envelope-from ) id 5a423cca-02b7-7f0000012729-7f000001d5d9-1 for ; Tue, 26 Dec 2017 13:12:58 +0100 Received: from [192.168.178.20] (xdsl-78-35-133-210.netcologne.de [78.35.133.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by cc-smtpin3.netcologne.de (Postfix) with ESMTPSA; Tue, 26 Dec 2017 13:12:56 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, fortran] Fix PR 83540 Message-ID: <098a8857-fcef-9506-baa4-c3645e7397ba@netcologne.de> Date: Tue, 26 Dec 2017 13:12:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Hello world, this rather self-explanatory patch makes sure we don't get an error using reallocation on assignment for inlining matmul when we don't have reallocation on assignment. Regression-tested. OK for trunk? Regards Thomas 2017-12-25 Thomas Koenig PR fortran/83540 * frontend-passes.c (create_var): If an array to be created has unknown size and -fno-realloc-lhs is in effect, return NULL. 2017-12-25 Thomas Koenig PR fortran/83540 * gfortran.dg/inline_matmul_20.f90: New test. Index: frontend-passes.c =================================================================== --- frontend-passes.c (Revision 255788) +++ frontend-passes.c (Arbeitskopie) @@ -720,6 +720,11 @@ create_var (gfc_expr * e, const char *vname) if (e->expr_type == EXPR_CONSTANT || is_fe_temp (e)) return gfc_copy_expr (e); + /* Creation of an array of unknown size requires realloc on assignment. + If that is not possible, just return NULL. */ + if (flag_realloc_lhs == 0 && e->rank > 0 && e->shape == NULL) + return NULL; + ns = insert_block (); if (vname)