From patchwork Mon Nov 29 11:28:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1561118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=pgEkxfYG; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4J2jmM4WxXz9s3q for ; Mon, 29 Nov 2021 22:29:07 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6CF2F386F437 for ; Mon, 29 Nov 2021 11:29:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6CF2F386F437 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638185345; bh=Vca7KYwz9HynyVi4GjeKwhYaocIqHG1NO9BERExyR28=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=pgEkxfYG+IhSn6T08+25DNdZIHpzkh0I9s3Pu/+t0YossZXNPieNh7GruA9B/R3mG C4Ia6KMjq77RY+m2zOgV4muyNHep6e7P5ZeCihIHMJVPkHNika6QkSLZkpEdnSeHBo X8qDzULVzGRRKEZMWzKIJ/GatexknGFtgp93n56Q= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 6DC8A3858438; Mon, 29 Nov 2021 11:28:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6DC8A3858438 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4BA89212C9; Mon, 29 Nov 2021 11:28:06 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 31A7A13B53; Mon, 29 Nov 2021 11:28:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id rWnlCka5pGGjEgAAMHmgww (envelope-from ); Mon, 29 Nov 2021 11:28:06 +0000 Date: Mon, 29 Nov 2021 12:28:05 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Only return after resetting type_param_spec_list Message-ID: MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Cc: fortran@gcc.gnu.org Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This fixes an appearant mistake in gfc_insert_parameter_exprs. Bootstrap / regtest pending on x86_64-unknown-linux-gnu. OK? Thanks, Richard. 2021-11-29 Richard Biener gcc/fortran/ * decl.c (gfc_insert_parameter_exprs): Only return after resetting type_param_spec_list. --- gcc/fortran/decl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index c0fec90e3e0..4971638f9b6 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -3733,9 +3733,9 @@ gfc_insert_parameter_exprs (gfc_expr *e, gfc_actual_arglist *param_list) { gfc_actual_arglist *old_param_spec_list = type_param_spec_list; type_param_spec_list = param_list; - return gfc_traverse_expr (e, NULL, &insert_parameter_exprs, 1); - type_param_spec_list = NULL; + bool res = gfc_traverse_expr (e, NULL, &insert_parameter_exprs, 1); type_param_spec_list = old_param_spec_list; + return res; } /* Determines the instance of a parameterized derived type to be used by