re PR rtl-optimization/66048 ([i386] ICE in create_pre_exit when both AVX and MPX...

gcc/

	PR target/66048
	* function.c (diddle_return_value_1): Process bounds first.
	* config/i38/i386.c (ix86_function_value_regno_p): Add bnd1
	register.

gcc/testsuite/

	PR target/66048
	* gcc.target/i386/mpx/pr66048.cc: New.

From-SVN: r223114

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5d03f432abfa2ae7761738af6dd881d23309f05a..35f8197d22bf156ca09a35dcf9ce93fee72297e7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-13  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+       PR target/66048
+       * function.c (diddle_return_value_1): Process bounds first.
+       * config/i38/i386.c (ix86_function_value_regno_p): Add bnd1
+       register.
+
 2015-05-13  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
        PR rtl-optimization/64616

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index fd52d891257bdaee6bdfcf05210d2255f2c5f660..bda32570d54000d2f23193831c80965d28d287dc 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -8216,7 +8216,8 @@ ix86_function_value_regno_p (const unsigned int regno)
     case SI_REG:
       return TARGET_64BIT && ix86_abi != MS_ABI;
 
-    case FIRST_BND_REG:
+    case BND0_REG:
+    case BND1_REG:
       return chkp_function_instrumented_p (current_function_decl);
 
       /* Complex values are returned in %st(0)/%st(1) pair.  */

diff --git a/gcc/function.c b/gcc/function.c
index 42d5aebd418f636c5135994be2998ebda090f458..eb90ed5752cf44f146509efe99a77ebf498c6704 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5224,8 +5224,8 @@ diddle_return_value_1 (void (*doit) (rtx, void *), void *arg, rtx outgoing)
 void
 diddle_return_value (void (*doit) (rtx, void *), void *arg)
 {
-  diddle_return_value_1 (doit, arg, crtl->return_rtx);
   diddle_return_value_1 (doit, arg, crtl->return_bnd);
+  diddle_return_value_1 (doit, arg, crtl->return_rtx);
 }
 
 static void

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0a7064872bbd6924b9b9370c8117ce113b8e372c..2f83f4e4fca78f0c907e0bd5e1b2625f97a45c37 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-13  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+       PR target/66048
+       * gcc.target/i386/mpx/pr66048.cc: New.
+
 2015-05-13  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
        PR rtl-optimization/64616

diff --git a/gcc/testsuite/gcc.target/i386/mpx/pr66048.cc b/gcc/testsuite/gcc.target/i386/mpx/pr66048.cc
new file mode 100644 (file)
index 0000000..b29cd03
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/mpx/pr66048.cc
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fcheck-pointer-bounds -mmpx -march=corei7-avx" } */
+
+struct c1
+{
+  c1 (const c1 &other) : p (other.p) { };
+  int *p;
+};
+
+struct c2 : public c1 { };
+
+c1
+test (c2 a)
+{
+  return a;
+}