diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cc619be5b5e..b5a246df774 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-02  Richard Biener  <rguenther@suse.de>
+
+	* genmatch.c (dt_node::gen_kids): Fix match code-gen for embedded
+	GENERIC expressions in GIMPLE.
+
 2016-03-02  Richard Biener  <rguenther@suse.de>
 
 	* config/i386/i386.c (type_natural_mode): Fix typo.
diff --git a/gcc/genmatch.c b/gcc/genmatch.c
index 19218fdaf2e..bb97bfb642c 100644
--- a/gcc/genmatch.c
+++ b/gcc/genmatch.c
@@ -2615,7 +2615,7 @@ dt_node::gen_kids (FILE *f, int indent, bool gimple)
 		preds.safe_push (op);
 	      else
 		{
-		  if (gimple)
+		  if (gimple && !e->is_generic)
 		    gimple_exprs.safe_push (op);
 		  else
 		    generic_exprs.safe_push (op);