From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id BF34D3858C2D; Tue, 29 Nov 2022 18:19:20 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF34D3858C2D
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1669745960;
	bh=xy4ex8Bi3mehkvE9QrhyEHnntxNDp1mNZI8CgO/+ILA=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=XLfvDnUPZ7QwRUVlsOhQC5CYIyoLoAsGFm7ZIcI+h8NVr8svzb6ADQwJlpSGqdR/Q
	 SUmFccBELwjP8VAvyEnXllcY9aiWcJCp32zD/usfZowcQjUSTBj7KQl1H9Q+GsptJG
	 +yzdBCxWVx/55980ozEH8LFgXkezdepso5avMe6c=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug fortran/107874] merge not using all its arguments
Date: Tue, 29 Nov 2022 18:19:19 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: fortran
X-Bugzilla-Version: unknown
X-Bugzilla-Keywords: wrong-code
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: ASSIGNED
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: anlauf at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-107874-4-z9hTpbYJMX@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-107874-4@http.gcc.gnu.org/bugzilla/>
References: <bug-107874-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D107874

--- Comment #7 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Harald Anlauf <anlauf@gcc.gnu.org>:

https://gcc.gnu.org/g:3832c6f7e672e76bba74a508bf3a49740ea38046

commit r13-4394-g3832c6f7e672e76bba74a508bf3a49740ea38046
Author: Harald Anlauf <anlauf@gmx.de>
Date:   Mon Nov 28 20:43:02 2022 +0100

    Fortran: intrinsic MERGE shall use all its arguments [PR107874]

    gcc/fortran/ChangeLog:

            PR fortran/107874
            * simplify.cc (gfc_simplify_merge): When simplifying MERGE with=
 a
            constant scalar MASK, ensure that arguments TSOURCE and FSOURCE=
 are
            either constant or will be evaluated.
            * trans-intrinsic.cc (gfc_conv_intrinsic_merge): Evaluate argum=
ents
            before generating conditional expression.

    gcc/testsuite/ChangeLog:

            PR fortran/107874
            * gfortran.dg/merge_init_expr_2.f90: Adjust code to the correct=
ed
            simplification.
            * gfortran.dg/merge_1.f90: New test.

    Co-authored-by: Steven G. Kargl <kargl@gcc.gnu.org>=