From patchwork Thu Jul 2 20:41:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1321913 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=8.43.85.97; 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=AJzbWCmG; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 49yVPN6FZlz9sPF for ; Fri, 3 Jul 2020 06:41:27 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7E208386F451; Thu, 2 Jul 2020 20:41:21 +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.15.15]) by sourceware.org (Postfix) with ESMTPS id 6087B3857007; Thu, 2 Jul 2020 20:41:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6087B3857007 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=1593722476; bh=YTup+hVTC1874rbSclhknpYvH0WDYoNORdaQzuD255A=; h=X-UI-Sender-Class:From:To:Subject:Date; b=AJzbWCmGw2h++As1fEFjXkwkCgUkkZK0gp9iYLcyY50SwE74noxGjL3ZUo8c1Ktox SpK3IzBorPIADiDfR3MNlTfg55Zp+MuI8AwADbl60nRNgMOeR10zI3UTbj1UrwrJDr 2ElM7YloLY6WItQ79ZJ1bdVd077qOlovZTeH62t4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.82.119] ([93.207.82.119]) by web-mail.gmx.net (3c-app-gmx-bs71.server.lan [172.19.170.216]) (via HTTP); Thu, 2 Jul 2020 22:41:16 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] PR fortran/95709 - [9/10/11 Regression] ICE in gfc_resolve_code, at fortran/resolve.c:11807 Date: Thu, 2 Jul 2020 22:41:16 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:op1dNfG5ZzD00lrG7Hvu53QB21Ate8JDTL5Bo0GiDy8PO1A239G22hbYo/rVBUuiNVqn0 tCi4z+ZUXqY6FSlMkOIZ2ozLLmjzYvg4HKiN1C3NzNaz7a5upWqlj9vE1h2onRzGYrWpQsV3TQwn pJnGIFmK00lFaiUizkqEoNGcOAHu0QuazLvO0RXOwSpSlH+3BZQ97rqWP7V8GKJAtBUfdeWqnL5H rGtEwFw1lIlFNOag8Pxda/VSs/vsSAKKkSzDcWj72FgLiXVlhmIXkpsm38GydTcT3IYGxz25Tvfs g0= X-UI-Out-Filterresults: notjunk:1;V03:K0:2K5XKBr7gaU=:HD1goZD0FwiJDXPEPmATv7 MSpIdfGB+GxeSzV5yI+FHEF+rjyvsAFFwz1U2eY9RlBm97gzEHcrVkfSNGkzH6Sta4ipMHnDf 4gkUKqOYFHnSSfvqzJxF63jhNmB65uf2I3KBBcA6Ok7SY/G7n+RF3zfzW2GxbaEwEy/hCL9VT qzhM8CyXNwlNScodwhUTkpVFDZln2S10bueg1LwLcwkofWHfMWLWNPQCo3voRQwNOaZAeBnWc 3kPOHjFSLuM2FyNnc1gLId9r/36rfE7XV03COeE7dGai+6G2Z1SSYjG13W1Pmz1tbxWAZk1Bx OFnj8e7Kd6ZRl4Mn6y8vF1qWr17bxPIkffH2ePsof9lUjYvsRiMBk+fO2u3MlGJG3D+tef0Pu 5c1m9OJma8wlD7CgsdpJVWrK0LMBDhb7Z9m7wTCFuU79ar9pV85Y5UV5tZNFA9mtg5SxINfvN A5OX4EpT5Im5ZvK5o5Y51//xBWeLpzYHC3r7f5TkJwWf6zvydeVPacV7BoOXnNPdyFf3WjsLK hAQhWvWbEeShsYnebxFUBdtS8CQ4yplXgqmIrd70CSFFc92BHHej5sE/7kT7OH0WGInOyWHXM TgsYPosWiumXPWdAnw1u+uGiQ8KFl+WFFbplInLMBEi+GUNudWn9VF2p9Nzn+TRfVNqA8Qes7 Re+R5hFH6wGqSj/9YMqq+5a/ljFyS0QeIct/nJ/Y441ehsQ== X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, 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" The obsolescent (=legacy) assigned GOTO should only allow scalar integer variables. Check for proper conditions. Regtested on x86_64-pc-linux-gnu. OK for master / backports? Thanks, Harald PR fortran/95709 - ICE in gfc_resolve_code, at fortran/resolve.c:11807 The legacy "assigned GOTO" accepts only scalar integer variables. Check for proper arguments. gcc/fortran/ PR fortran/95709 * resolve.c (gfc_resolve_code): Check for valid arguments to asigned GOTO. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5cc9f72e55c..34b1b80c31e 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -11814,10 +11814,13 @@ start: case EXEC_GOTO: if (code->expr1 != NULL) { - if (code->expr1->ts.type != BT_INTEGER) - gfc_error ("ASSIGNED GOTO statement at %L requires an " - "INTEGER variable", &code->expr1->where); - else if (code->expr1->symtree->n.sym->attr.assign != 1) + if (code->expr1->ts.type != BT_INTEGER + || code->expr1->rank != 0 + || code->expr1->symtree == NULL) + gfc_error ("ASSIGNED GOTO statement at %L requires a " + "scalar INTEGER variable", &code->expr1->where); + else if (code->expr1->symtree->n.sym + && code->expr1->symtree->n.sym->attr.assign != 1) gfc_error ("Variable %qs has not been assigned a target " "label at %L", code->expr1->symtree->n.sym->name, &code->expr1->where); diff --git a/gcc/testsuite/gfortran.dg/pr95709.f90 b/gcc/testsuite/gfortran.dg/pr95709.f90 new file mode 100644 index 00000000000..6acd6fd14e6 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr95709.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! { dg-options "-std=legacy" } +! PR fortran/95709 - ICE in gfc_resolve_code, at fortran/resolve.c:11807 + +program p + integer, parameter :: i(1) = 1 + goto i(1) ! { dg-error "requires a scalar INTEGER variable" } + goto i%kind, (1) ! { dg-error "requires a scalar INTEGER variable" } +1 continue +end