From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1647) id 9CB613858401; Tue, 16 Nov 2021 18:08:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9CB613858401 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Mikael Morin To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5314] fortran: Tiny sort_actual internal refactoring X-Act-Checkin: gcc X-Git-Author: Mikael Morin X-Git-Refname: refs/heads/master X-Git-Oldrev: 7461b5813126c6dbe11f0f9d06c1bd83b082111e X-Git-Newrev: c31733c3bf57d4cfc31e8d7a95b0ba2cd41e6ea3 Message-Id: <20211116180801.9CB613858401@sourceware.org> Date: Tue, 16 Nov 2021 18:08:01 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Nov 2021 18:08:01 -0000 https://gcc.gnu.org/g:c31733c3bf57d4cfc31e8d7a95b0ba2cd41e6ea3 commit r12-5314-gc31733c3bf57d4cfc31e8d7a95b0ba2cd41e6ea3 Author: Mikael Morin Date: Sun Nov 7 14:39:47 2021 +0100 fortran: Tiny sort_actual internal refactoring Preliminary refactoring to make further changes more obvious. No functional change. gcc/fortran/ChangeLog: * intrinsic.c (sort_actual): initialise variable and use it earlier. Diff: --- gcc/fortran/intrinsic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c index 2d7d2461fd0..33b827673e7 100644 --- a/gcc/fortran/intrinsic.c +++ b/gcc/fortran/intrinsic.c @@ -4379,19 +4379,18 @@ do_sort: for (f = formal; f; f = f->next) { - if (f->actual && f->actual->label != NULL && f->ts.type) + a = f->actual; + if (a && a->label != NULL && f->ts.type) { gfc_error ("ALTERNATE RETURN not permitted at %L", where); return false; } - if (f->actual == NULL) + if (a == NULL) { a = gfc_get_actual_arglist (); a->missing_arg_type = f->ts.type; } - else - a = f->actual; if (actual == NULL) *ap = a;