Re: [PATCH] Fix incorrect gimple_build arguments in gimple-fold.c (PR tree-optimization/69172)

[Richard Biener]

On Thu, 7 Jan 2016, Jakub Jelinek wrote:

> Hi!
> 
> gimple_build wants the type after POINTER_PLUS_EXPR, but
> gimple_fold_builtin_memory_chk wasn't passing it.
> 
> Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for
> trunk?

Oops, yes.

Thanks,
Richard.

> 2016-01-07  Jakub Jelinek  
> 
>   PR tree-optimization/69172
>   * gimple-fold.c (gimple_fold_builtin_memory_chk): Pass type to
>   gimple_build.
> 
>   * gcc.dg/pr69172.c: New test.
> 
> --- gcc/gimple-fold.c.jj  2016-01-04 14:55:53.0 +0100
> +++ gcc/gimple-fold.c 2016-01-07 11:37:36.697047480 +0100
> @@ -1710,7 +1710,8 @@ gimple_fold_builtin_memory_chk (gimple_s
>   {
> gimple_seq stmts = NULL;
> len = gimple_convert_to_ptrofftype (, loc, len);
> -   tree temp = gimple_build (, loc, POINTER_PLUS_EXPR, dest, len);
> +   tree temp = gimple_build (, loc, POINTER_PLUS_EXPR,
> + TREE_TYPE (dest), dest, len);
> gsi_insert_seq_before (gsi, stmts, GSI_SAME_STMT);
> replace_call_with_value (gsi, temp);
> return true;
> --- gcc/testsuite/gcc.dg/pr69172.c.jj 2016-01-07 11:59:13.433897448 +0100
> +++ gcc/testsuite/gcc.dg/pr69172.c2016-01-07 11:59:02.0 +0100
> @@ -0,0 +1,45 @@
> +/* PR tree-optimization/69172 */
> +/* { dg-do compile } */
> +/* { dg-options "-O2" } */
> +
> +int a;
> +
> +void *
> +f1 (void)
> +{
> +  int *b = , *c = 
> +  return __builtin___mempcpy_chk (b, c, sizeof (int), 0);
> +}
> +
> +void *
> +f2 (void)
> +{
> +  int *b = 
> +  return __builtin___mempcpy_chk (b, b, sizeof (int), 0);
> +}
> +
> +void *
> +f3 (void)
> +{
> +  return __builtin___mempcpy_chk (, , sizeof (int), 0);
> +}
> +
> +void *
> +f4 (int x)
> +{
> +  int *b = , *c = 
> +  return __builtin___mempcpy_chk (b, c, x, 0);
> +}
> +
> +void *
> +f5 (int x)
> +{
> +  int *b = 
> +  return __builtin___mempcpy_chk (b, b, x, 0);
> +}
> +
> +void *
> +f6 (int x)
> +{
> +  return __builtin___mempcpy_chk (, , x, 0);
> +}
> 
>   Jakub
> 
> 

-- 
Richard Biener 
SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 
21284 (AG Nuernberg)

[PATCH] Fix incorrect gimple_build arguments in gimple-fold.c (PR tree-optimization/69172)

[Jakub Jelinek]

Hi!

gimple_build wants the type after POINTER_PLUS_EXPR, but
gimple_fold_builtin_memory_chk wasn't passing it.

Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for
trunk?

2016-01-07  Jakub Jelinek  

PR tree-optimization/69172
* gimple-fold.c (gimple_fold_builtin_memory_chk): Pass type to
gimple_build.

* gcc.dg/pr69172.c: New test.

--- gcc/gimple-fold.c.jj2016-01-04 14:55:53.0 +0100
+++ gcc/gimple-fold.c   2016-01-07 11:37:36.697047480 +0100
@@ -1710,7 +1710,8 @@ gimple_fold_builtin_memory_chk (gimple_s
{
  gimple_seq stmts = NULL;
  len = gimple_convert_to_ptrofftype (, loc, len);
- tree temp = gimple_build (, loc, POINTER_PLUS_EXPR, dest, len);
+ tree temp = gimple_build (, loc, POINTER_PLUS_EXPR,
+   TREE_TYPE (dest), dest, len);
  gsi_insert_seq_before (gsi, stmts, GSI_SAME_STMT);
  replace_call_with_value (gsi, temp);
  return true;
--- gcc/testsuite/gcc.dg/pr69172.c.jj   2016-01-07 11:59:13.433897448 +0100
+++ gcc/testsuite/gcc.dg/pr69172.c  2016-01-07 11:59:02.0 +0100
@@ -0,0 +1,45 @@
+/* PR tree-optimization/69172 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int a;
+
+void *
+f1 (void)
+{
+  int *b = , *c = 
+  return __builtin___mempcpy_chk (b, c, sizeof (int), 0);
+}
+
+void *
+f2 (void)
+{
+  int *b = 
+  return __builtin___mempcpy_chk (b, b, sizeof (int), 0);
+}
+
+void *
+f3 (void)
+{
+  return __builtin___mempcpy_chk (, , sizeof (int), 0);
+}
+
+void *
+f4 (int x)
+{
+  int *b = , *c = 
+  return __builtin___mempcpy_chk (b, c, x, 0);
+}
+
+void *
+f5 (int x)
+{
+  int *b = 
+  return __builtin___mempcpy_chk (b, b, x, 0);
+}
+
+void *
+f6 (int x)
+{
+  return __builtin___mempcpy_chk (, , x, 0);
+}

Jakub