From: Ilya Enkovich <ilya.enkovich@intel.com>
Date: Fri, 3 Apr 2015 08:51:26 +0000 (+0000)
Subject: i386.c (ix86_expand_call): Avoid nested PARALLEL in returned call value.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fad71ff5e7497d9b94fcab47e15856114421f7ec;p=gcc.git

i386.c (ix86_expand_call): Avoid nested PARALLEL in returned call value.

	* config/i386/i386.c (ix86_expand_call): Avoid nested
	PARALLEL in returned call value.

From-SVN: r221851
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a11ec1cc0e5..b37e15d32e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+	* config/i386/i386.c (ix86_expand_call): Avoid nested
+	PARALLEL in returned call value.
+
 2015-04-02  Ilya Enkovich  <ilya.enkovich@intel.com>
 
 	* lto-cgraph.c (input_cgraph_1): Always link instrumented
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index d8d9983009d..02b5103138a 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -25624,8 +25624,19 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1,
 	{
 	  rtx b0 = gen_rtx_REG (BND64mode, FIRST_BND_REG);
 	  rtx b1 = gen_rtx_REG (BND64mode, FIRST_BND_REG + 1);
-	  retval = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (3, retval, b0, b1));
-	  chkp_put_regs_to_expr_list (retval);
+	  if (GET_CODE (retval) == PARALLEL)
+	    {
+	      b0 = gen_rtx_EXPR_LIST (VOIDmode, b0, const0_rtx);
+	      b1 = gen_rtx_EXPR_LIST (VOIDmode, b1, const0_rtx);
+	      rtx par = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, b0, b1));
+	      retval = chkp_join_splitted_slot (retval, par);
+	    }
+	  else
+	    {
+	      retval = gen_rtx_PARALLEL (VOIDmode,
+					 gen_rtvec (3, retval, b0, b1));
+	      chkp_put_regs_to_expr_list (retval);
+	    }
 	}
 
       call = gen_rtx_SET (VOIDmode, retval, call);