[PATCH] PR target/66817: Check int_size_in_bytes in ix86_return_in_memory

[PATCH] PR target/66817: Check int_size_in_bytes in ix86_return_in_memory

[H.J. Lu]

ix86_return_in_memory should check negative return from int_size_in_bytes,
similar to other ports.

Tested on Linux/x86-64. OK for trunk?

Thanks.


H.J.
---
gcc/

	PR target/66817
	* config/i386/i386.c (ix86_return_in_memory): Return true
	if int_size_in_bytes returns negative for IA MCU.

gcc/testsuite/

	PR target/66817
	* gcc.target/i386/pr66817.c: New test.
---
 gcc/config/i386/i386.c                  |  2 +-
 gcc/testsuite/gcc.target/i386/pr66817.c | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.target/i386/pr66817.c

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 55a32ac..54ee6f3 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -8682,7 +8682,7 @@ ix86_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
       /* Intel MCU psABI returns scalars and aggregates no larger than 8
 	 bytes in registers.  */
       if (TARGET_IAMCU)
-	return VECTOR_MODE_P (mode) || size > 8;
+	return VECTOR_MODE_P (mode) || size < 0 || size > 8;
 
       if (mode == BLKmode)
 	return true;
diff --git a/gcc/testsuite/gcc.target/i386/pr66817.c b/gcc/testsuite/gcc.target/i386/pr66817.c
new file mode 100644
index 0000000..7ec18b7
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr66817.c
@@ -0,0 +1,27 @@
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-O2 -mno-sse -mno-mmx -miamcu" } */
+
+extern void abort (void);
+int
+main (int argc, char **argv)
+{
+  int size = 10;
+  typedef struct
+    {
+      char val[size];
+    }
+  block;
+  block a, b;
+  block __attribute__((noinline))
+  retframe_block ()
+    {
+      return *(block *) &b;
+    }
+  b.val[0] = 1;
+  b.val[9] = 2;
+  a=retframe_block ();
+  if (a.val[0] != 1
+      || a.val[9] != 2)
+    abort ();
+  return 0;
+}
-- 
2.4.3

Re: [PATCH] PR target/66817: Check int_size_in_bytes in ix86_return_in_memory

[Uros Bizjak]

On Wed, Jul 8, 2015 at 11:16 PM, H.J. Lu <hongjiu.lu@intel.com> wrote:
> ix86_return_in_memory should check negative return from int_size_in_bytes,
> similar to other ports.
>
> Tested on Linux/x86-64. OK for trunk?
>
> Thanks.
>
>
> H.J.
> ---
> gcc/
>
>         PR target/66817
>         * config/i386/i386.c (ix86_return_in_memory): Return true
>         if int_size_in_bytes returns negative for IA MCU.
>
> gcc/testsuite/
>
>         PR target/66817
>         * gcc.target/i386/pr66817.c: New test.

OK.

Thanks,
Uros.

> ---
>  gcc/config/i386/i386.c                  |  2 +-
>  gcc/testsuite/gcc.target/i386/pr66817.c | 27 +++++++++++++++++++++++++++
>  2 files changed, 28 insertions(+), 1 deletion(-)
>  create mode 100644 gcc/testsuite/gcc.target/i386/pr66817.c
>
> diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
> index 55a32ac..54ee6f3 100644
> --- a/gcc/config/i386/i386.c
> +++ b/gcc/config/i386/i386.c
> @@ -8682,7 +8682,7 @@ ix86_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
>        /* Intel MCU psABI returns scalars and aggregates no larger than 8
>          bytes in registers.  */
>        if (TARGET_IAMCU)
> -       return VECTOR_MODE_P (mode) || size > 8;
> +       return VECTOR_MODE_P (mode) || size < 0 || size > 8;
>
>        if (mode == BLKmode)
>         return true;
> diff --git a/gcc/testsuite/gcc.target/i386/pr66817.c b/gcc/testsuite/gcc.target/i386/pr66817.c
> new file mode 100644
> index 0000000..7ec18b7
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/i386/pr66817.c
> @@ -0,0 +1,27 @@
> +/* { dg-do compile { target ia32 } } */
> +/* { dg-options "-O2 -mno-sse -mno-mmx -miamcu" } */
> +
> +extern void abort (void);
> +int
> +main (int argc, char **argv)
> +{
> +  int size = 10;
> +  typedef struct
> +    {
> +      char val[size];
> +    }
> +  block;
> +  block a, b;
> +  block __attribute__((noinline))
> +  retframe_block ()
> +    {
> +      return *(block *) &b;
> +    }
> +  b.val[0] = 1;
> +  b.val[9] = 2;
> +  a=retframe_block ();
> +  if (a.val[0] != 1
> +      || a.val[9] != 2)
> +    abort ();
> +  return 0;
> +}
> --
> 2.4.3
>