From patchwork Tue Oct 13 20:17:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1381711 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=aO+F6uLl; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C9mzw2hXmz9sVH for ; Wed, 14 Oct 2020 07:17:13 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CA94F3941C0D; Tue, 13 Oct 2020 20:17:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id E02E73850431; Tue, 13 Oct 2020 20:17:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E02E73850431 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=anlauf@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1602620223; bh=d5eYHmpgKtC4GXtvV3VK2Ti/WWlBvhoygmGrP3YZBls=; h=X-UI-Sender-Class:From:To:Subject:Date; b=aO+F6uLls65LtdujnkU1CTs4Vnt6qK4xfpCe6q6MMHNomqb1Ky5D8aiZ7yScEoFmB fTNkVFAAKOlrZJWlx6tHAjY6ABJdsOAErY3lxpjGO0GYTOzxU+U+38RKZpFHZMZtkL 8vJdsqkzPsuh0crladcmZ6DZhTeYIjuepiaFYW5g= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.13.157] ([79.251.13.157]) by web-mail.gmx.net (3c-app-gmx-bap55.server.lan [172.19.172.125]) (via HTTP); Tue, 13 Oct 2020 22:17:03 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] PR fortran/97408 - Diagnose non-constant KIND argument to intrinsics Date: Tue, 13 Oct 2020 22:17:03 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:ouPgH71aXnNkmsEb96waZNS16+YczolGJjGaVSPMXZlcQ2EDnc62HRHAhzim4WhC/af4A TrGsNZguqGf+Wgl6a/FRoDMqM0mgrPIX7ES//ri8VfKfMkhyTM65c1kVWwN8vt4/iZ8zywazV315 ksRFFATLyeLpNLAxkc+nf5nPa6cgWlVI/ORTTrcK8tE9YYY3fztiIEVdpBCTjlwoObdmI+nO7JRv vADbyuMfKRdSaWZGgs71ycTH/Wf/XCxd2G4wiFdrbrQRp2265OwCYaWsjttiqbXovyqocYcYhFiO og= X-UI-Out-Filterresults: notjunk:1;V03:K0:AZzaYdyDY4o=:Pp352mPgnpEK3d98B4xOKF JrCyzW7k1vbFPP3zBqB/v1CGrPDxPUtbf537FJ2Vo7mCTZHjSEJMwqKjj2x/0dia5uEfr7Mpd Edc16CTOEtAA2ikCMGL+Of6Cis/bEUex101pSsbUJCgpW6aPrHXz5eJIo+/pxJ9TPQ2XcJpN6 akF+AyROvoh3N9KZ3To6637nc8w8eEIABfo3v2fSyKmUHnEeLK/nBoZyoD4UYTP57GeFewOeE UUX1KAwAR8I6t838t6/Nkj7nFV4p5nVDGLyfVygDXIyHOdYV3rNCLq8esvPgyNOPm2rN48pkT /V02ZZeriMSnrSbUyJ9SDrXJIPI1jIUVStwubtehHeCvDZminGqY58yiGpHPht+CfLELdHuUB 0whvF/Jnc1bDGclaC8PoyHAy0gEFA4OqQ2dV+b/UzKyt4opmpRuT2aTNKV7XYHLNN8ieZbOsL 0IXxWT1CpoIiY6wK+GLXq2SYfe4HjiD66/kwulInrZj/Scsc2HSvEbvitpup7VwXJ+fs4KM0i q2h79NMCzcEUSByVvt5Svuk3W8V/4tzL4SyQgYLdQf0KtptZLsSP5dbvnSXFxjVJnnWB32UL5 d+cBJ7i+7yVWuzNBGk1rS3QbkJ+EZUnPanmZaDvis4ZeA1/e8LoaxOF8bLCJhpLmDFWy5PUU0 8JoLEkBTQ8FPVhsIPtPXUflkbX4qJwymHChNC2IRJg46BYg== X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" While looking at some other PR, I found the urgent need for a rather obvious improvement to compile-time diagnostics: The KIND argument to intrinsics must be a compile-time constant. Regtested on x86_64-pc-linux-gnu. OK for master? Thanks, Harald PR fortran/97408 - Diagnose non-constant KIND argument to intrinsics The KIND argument to intrinsics must be a compile-time argument. Improve check so that the proper diagnostics is emitted. gcc/fortran/ChangeLog: * check.c (kind_check): Enhance check for non-constant KIND arguments. gcc/testsuite/ChangeLog: * gfortran.dg/kind_2.f90: New test. diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 1e64fab3401..fa795538a7c 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -646,7 +646,7 @@ kind_check (gfc_expr *k, int n, bt type) if (!scalar_check (k, n)) return false; - if (!gfc_check_init_expr (k)) + if (!gfc_check_init_expr (k) || k->expr_type == EXPR_VARIABLE) { gfc_error ("%qs argument of %qs intrinsic at %L must be a constant", gfc_current_intrinsic_arg[n]->name, gfc_current_intrinsic, diff --git a/gcc/testsuite/gfortran.dg/kind_2.f90 b/gcc/testsuite/gfortran.dg/kind_2.f90 new file mode 100644 index 00000000000..f3e5b7503ef --- /dev/null +++ b/gcc/testsuite/gfortran.dg/kind_2.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! PR97408 - Diagnose non-constant KIND argument to intrinsics + +program p + implicit none + integer :: i + integer, parameter :: lk(1) = [ 4 ] + print *, (int (1 , lk(i)), i=1,1) ! { dg-error "must be a constant" } + print *, (real (1 , lk(i)), i=1,1) ! { dg-error "must be a constant" } + print *, (cmplx (1, kind=lk(i)), i=1,1) ! { dg-error "must be a constant" } + print *, (logical (.true., lk(i)), i=1,1) ! { dg-error "must be a constant" } +end