From patchwork Wed Jan 3 11:13:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 854984 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-470040-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="ToN5TS+C"; 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 3zBSxQ224Gz9s7f for ; Wed, 3 Jan 2018 22:14:16 +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=ETEj4m936p9aPVlj6mgQdVIt3rt3gPquAJW+G33CBLM+UGUYbr u52WftN0HrzHkytBaIn6WbyK1xAE8fWmtQ7fZlbObIoNspOgXxj8gs9ZrsNRb89Q +5zeQcAXSDTjN70AWwbCLkWEXAdeq/6KX2MJfatCrQNqChyS8Vr8l64Fs= 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=NKTS62vx+x57nMx5vgXKgGU+V9I=; b=ToN5TS+Cd60/g5CYhj/L ND6JMzbAeRKbuM+JhHaNWevlKYTlHpBG0hE7L+dxzuKC8cjyBdvLWJ8QI42m8idk mbDNLwTHaQd12VXqqCy4nM149GpEPS7ocohRkKRT6NxFoUkywH+qoiWPB49IzRj/ ji4JE+hkynDYeBSKN2/TJLo= Received: (qmail 12693 invoked by alias); 3 Jan 2018 11:14:02 -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 12657 invoked by uid 89); 3 Jan 2018 11:14:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-12.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=UD:check.c, checkc, check.c X-Spam-User: qpsmtpd, 2 recipients 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; Wed, 03 Jan 2018 11:13:59 +0000 Received: from cc-smtpin3.netcologne.de (cc-smtpin3.netcologne.de [89.1.8.203]) by cc-smtpout1.netcologne.de (Postfix) with ESMTP id 396C113682; Wed, 3 Jan 2018 12:13:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin3.netcologne.de (Postfix) with ESMTP id 34BE511D90; Wed, 3 Jan 2018 12:13:57 +0100 (CET) Received: from [78.35.145.170] (helo=cc-smtpin3.netcologne.de) by localhost with ESMTP (eXpurgate 4.1.9) (envelope-from ) id 5a4cbaf5-02b7-7f0000012729-7f000001db04-1 for ; Wed, 03 Jan 2018 12:13:57 +0100 Received: from [192.168.178.20] (xdsl-78-35-145-170.netcologne.de [78.35.145.170]) (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; Wed, 3 Jan 2018 12:13:55 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, fortran] Fix PR 83664, missing check on boundary argument for eoshift Message-ID: <60e90697-4c0c-a7fe-65c4-f0ed483788bc@netcologne.de> Date: Wed, 3 Jan 2018 12:13:53 +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, the attached patch fixes a missing check for eoshift. If you're wondering what the "else" belongs to - it is if (boundary != NULL) Regression-tested. OK for trunk? Regards Thomas 2018-01-03 Thomas Koenig PR fortran/83664 * check.c (gfc_check_eoshift): Error for missing boundary if array is not one of the standard types. 2018-01-03 Thomas Koenig PR fortran/83664 * gfortran.dg/eoshift_7.f90: New test. Index: check.c =================================================================== --- check.c (Revision 255788) +++ check.c (Arbeitskopie) @@ -2270,6 +2270,26 @@ gfc_check_eoshift (gfc_expr *array, gfc_expr *shif return false; } } + else + { + switch (array->ts.type) + { + case BT_INTEGER: + case BT_LOGICAL: + case BT_REAL: + case BT_COMPLEX: + case BT_CHARACTER: + break; + + default: + gfc_error ("Missing %qs argument to %qs intrinsic at %L for %qs " + "of type %qs", gfc_current_intrinsic_arg[2]->name, + gfc_current_intrinsic, &array->where, + gfc_current_intrinsic_arg[0]->name, + gfc_typename (&array->ts)); + return false; + } + } return true; }