From patchwork Sun Nov 18 17:46:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 999533 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-490390-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=netcologne.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="udRcC/ey"; dkim=pass (2048-bit key; unprotected) header.d=netcologne.de header.i=@netcologne.de header.b="PnBlySj2"; 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 42yfYM5rCYz9s3Z for ; Mon, 19 Nov 2018 04:47:00 +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=ZJSD7ZanH4PLLA+xqXhcOZmcxksENsCh3EBqsYWX0dtMzDPrLZ gNj0ztp6ECb8Ny31XPF1leozgLUEPqToPRdK3nykgWA2nQAwQIlifG1K2J/Ao2WS qHC5IxGtN8kOyp9tRN22b5EOcDvDcoOhdVZBbnGy23oSb0KvJy9Yv1awE= 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=0PWuQiIFZ2KiryaJtKuKhK/nx3g=; b=udRcC/eyrSzOtadH8OuV 4xB6lpPot+opbhn5CmaHb19Y9WmnFJ4OPIdnojq4U+LQwX6/l9Dpc/xYhONQVeq6 Jd3YkSOPYKsexyvHMfJmpLUWuGYVhnzBdTg8MZZhPQgLPQlRSjNBpwU8tMs4Ju48 L9rypLnrSx97YFRmEP20U2E= Received: (qmail 119225 invoked by alias); 18 Nov 2018 17:46:51 -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 118060 invoked by uid 89); 18 Nov 2018 17:46:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=Real, sk:regress, intent X-HELO: cc-smtpout1.netcologne.de Received: from cc-smtpout1.netcologne.de (HELO cc-smtpout1.netcologne.de) (89.1.8.211) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 18 Nov 2018 17:46:49 +0000 Received: from cc-smtpin1.netcologne.de (cc-smtpin1.netcologne.de [89.1.8.201]) by cc-smtpout1.netcologne.de (Postfix) with ESMTP id B080813461; Sun, 18 Nov 2018 18:46:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=netcologne.de; s=nc1116a; t=1542563206; bh=V/DiA+Wj+7nUXUF9oyEtCdGFnBILY6Skgu2POGV4WL4=; h=To:From:Subject:Message-ID:Date:From; b=PnBlySj2/mTkz1NyXy3+H+RXgcIYGsJGD7UIfsyuWvb3azxzmA5dr3PLBMg8qaUef EO7QO5JzlzeOnbXrLUksBzUWxEqJCob0sJ2VdpEQbEIWPQd9WzMRPjQqLOe0sxqp7e Rr9t95DLFIATpx0FhziRKqCcgiaiJoioQQhnm7iPzl0rrVMOh/DC4gqhHG32xzrSZ7 f2Php64CjbLqLW1ob+1XfYVocE8R3t4903RQ/+ScdJyizeFiJSr82GGuAf0zwzFFH0 HNEEBdlCM/b9NdGnmdqMzFhGb4uQjzxsAR4QGa6ktULGMRCuEUEWQ8Arf+9ZObj1B7 Zwv/aSAJ56Jhw== Received: from localhost (localhost [127.0.0.1]) by cc-smtpin1.netcologne.de (Postfix) with ESMTP id AD89411D83; Sun, 18 Nov 2018 18:46:46 +0100 (CET) Received: from [78.35.132.3] (helo=cc-smtpin1.netcologne.de) by localhost with ESMTP (eXpurgate 4.6.0) (envelope-from ) id 5bf1a586-5f8a-7f0000012729-7f000001a95a-1 for ; Sun, 18 Nov 2018 18:46:46 +0100 Received: from [192.168.178.68] (xdsl-78-35-132-3.nc.de [78.35.132.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by cc-smtpin1.netcologne.de (Postfix) with ESMTPSA; Sun, 18 Nov 2018 18:46:45 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, committed] Fix PR 88073 Message-ID: <5f90469e-b3f3-88d4-7d73-bcceb6c851cd@netcologne.de> Date: Sun, 18 Nov 2018 18:46:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 Hello world, using the combined superpowers of Captain Obvious and Lieutenant Simple, I have committed the attached patch, which fixes a regression, as r266251, after regression-testing. I will backport to 8 and 7 in the next few days. Regards Thomas 2018-11-18 Thomas Koenig PR fortran/88073 * frontend-passes.c (combine_array_constructor): Do not do anything if in a WHERE statement. 2018-11-18 Thomas Koenig PR fortran/88073 * gfortran.dg/where_7.f90: New test. Index: frontend-passes.c =================================================================== --- frontend-passes.c (Revision 266250) +++ frontend-passes.c (Arbeitskopie) @@ -1773,6 +1773,10 @@ combine_array_constructor (gfc_expr *e) if (iterator_level > 0) return false; + /* WHERE also doesn't work. */ + if (in_where > 0) + return false; + op1 = e->value.op.op1; op2 = e->value.op.op2;