From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugs-return-408039-listarch-gcc-bugs=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 22543 invoked by alias); 28 Nov 2012 10:36:23 -0000
Received: (qmail 22465 invoked by uid 48); 28 Nov 2012 10:35:54 -0000
From: "janus at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug fortran/55501] [F03] ICE using MERGE in constant expr
Date: Wed, 28 Nov 2012 10:36:00 -0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: fortran
X-Bugzilla-Keywords: ice-on-valid-code
X-Bugzilla-Severity: normal
X-Bugzilla-Who: janus at gcc dot gnu.org
X-Bugzilla-Status: ASSIGNED
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: janus at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Changed-Fields: Status AssignedTo
Message-ID: <bug-55501-4-ptIMa566S9@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-55501-4@http.gcc.gnu.org/bugzilla/>
References: <bug-55501-4@http.gcc.gnu.org/bugzilla/>
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
Content-Type: text/plain; charset="UTF-8"
MIME-Version: 1.0
Mailing-List: contact gcc-bugs-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-bugs.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-bugs/>
List-Post: <mailto:gcc-bugs@gcc.gnu.org>
List-Help: <mailto:gcc-bugs-help@gcc.gnu.org>
Sender: gcc-bugs-owner@gcc.gnu.org
X-SW-Source: 2012-11/txt/msg02701.txt.bz2


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55501

janus at gcc dot gnu.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED
         AssignedTo|unassigned at gcc dot       |janus at gcc dot gnu.org
                   |gnu.org                     |

--- Comment #5 from janus at gcc dot gnu.org 2012-11-28 10:35:54 UTC ---
The following patch fixes it:

Index: gcc/fortran/simplify.c
===================================================================
--- gcc/fortran/simplify.c    (revision 193810)
+++ gcc/fortran/simplify.c    (working copy)
@@ -3973,8 +3973,10 @@ gfc_simplify_maskl (gfc_expr *i, gfc_expr *kind_ar
 gfc_expr *
 gfc_simplify_merge (gfc_expr *tsource, gfc_expr *fsource, gfc_expr *mask)
 {
-  if (tsource->expr_type != EXPR_CONSTANT
-      || fsource->expr_type != EXPR_CONSTANT
+  if ((tsource->expr_type != EXPR_CONSTANT
+       && tsource->expr_type != EXPR_STRUCTURE)
+      || (fsource->expr_type != EXPR_CONSTANT
+      && fsource->expr_type != EXPR_STRUCTURE)
       || mask->expr_type != EXPR_CONSTANT)
     return NULL;