Patchwork [committed] Avoid setting gimple_location of force_gimple_operand* created stmts to DECL_SOURCE_LOCATION of current fn (PR tree-optimization/56094)

login
register
mail settings
Submitter Jakub Jelinek
Date Jan. 28, 2013, 2:09 p.m.
Message ID <20130128140943.GF4385@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/216217/
State New
Headers show

Comments

Jakub Jelinek - Jan. 28, 2013, 2:09 p.m.
Hi!

As discussed in the PR, this is a safer variant of a fix for 4.8, where
input_location during most optimization passes is set to
DECL_SOURCE_LOCATION (current_function_decl) and various parts of the
gimplifier e.g. during force_gimple_operand* may end up setting
gimple_location to that.  For 4.9, we should revert this and set
input_location to UNKNOWN_LOCATION for the optimizers.

Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.

2013-01-28  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/56094
	* gimplify.c (force_gimple_operand_1): Temporarily set input_location
	to UNKNOWN_LOCATION while gimplifying expr.

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


	Jakub
Jeff Law - Jan. 28, 2013, 4:50 p.m.
On 01/28/2013 07:09 AM, Jakub Jelinek wrote:
> Hi!
>
> As discussed in the PR, this is a safer variant of a fix for 4.8, where
> input_location during most optimization passes is set to
> DECL_SOURCE_LOCATION (current_function_decl) and various parts of the
> gimplifier e.g. during force_gimple_operand* may end up setting
> gimple_location to that.  For 4.9, we should revert this and set
> input_location to UNKNOWN_LOCATION for the optimizers.
>
> Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.
>
> 2013-01-28  Jakub Jelinek  <jakub@redhat.com>
>
> 	PR tree-optimization/56094
> 	* gimplify.c (force_gimple_operand_1): Temporarily set input_location
> 	to UNKNOWN_LOCATION while gimplifying expr.
>
> 	* gcc.dg/pr56094.c: New test.
Based on c#15, we should probably consider this a bit of a band-aid, 
right?   Thus we'll install the band-aid, but keep the PR open pending a 
better solution for handling of input_location, correct?

jeff
> +/* Verify no statements get the location of the foo () decl.  */
> +/* { dg-final { scan-tree-dump-not " : 65:1\\\]" "optimized" } } */
> +/* { dg-final { cleanup-tree-dump "optimized" } } */
>
> 	Jakub
>
Jakub Jelinek - Jan. 28, 2013, 4:51 p.m.
On Mon, Jan 28, 2013 at 09:50:35AM -0700, Jeff Law wrote:
> >2013-01-28  Jakub Jelinek  <jakub@redhat.com>
> >
> >	PR tree-optimization/56094
> >	* gimplify.c (force_gimple_operand_1): Temporarily set input_location
> >	to UNKNOWN_LOCATION while gimplifying expr.
> >
> >	* gcc.dg/pr56094.c: New test.
> Based on c#15, we should probably consider this a bit of a band-aid,
> right?

Yeah.

> Thus we'll install the band-aid, but keep the PR open
> pending a better solution for handling of input_location, correct?

That's what I did.

	Jakub

Patch

--- gcc/gimplify.c.jj	2013-01-25 21:02:45.000000000 +0100
+++ gcc/gimplify.c	2013-01-28 11:34:15.671374132 +0100
@@ -8600,6 +8600,7 @@  force_gimple_operand_1 (tree expr, gimpl
 {
   enum gimplify_status ret;
   struct gimplify_ctx gctx;
+  location_t saved_location;
 
   *stmts = NULL;
 
@@ -8613,6 +8614,8 @@  force_gimple_operand_1 (tree expr, gimpl
   push_gimplify_context (&gctx);
   gimplify_ctxp->into_ssa = gimple_in_ssa_p (cfun);
   gimplify_ctxp->allow_rhs_cond_expr = true;
+  saved_location = input_location;
+  input_location = UNKNOWN_LOCATION;
 
   if (var)
     {
@@ -8634,6 +8637,7 @@  force_gimple_operand_1 (tree expr, gimpl
       gcc_assert (ret != GS_ERROR);
     }
 
+  input_location = saved_location;
   pop_gimplify_context (NULL);
 
   return expr;
--- gcc/testsuite/gcc.dg/pr56094.c.jj	2013-01-28 11:46:09.045221238 +0100
+++ gcc/testsuite/gcc.dg/pr56094.c	2013-01-28 11:47:54.052611852 +0100
@@ -0,0 +1,81 @@ 
+/* PR tree-optimization/56094 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -g -fdump-tree-optimized-lineno" } */
+
+_Bool cond;
+
+int
+fn0 (unsigned char, unsigned long long, unsigned char,
+     unsigned char, signed short, unsigned int,
+     unsigned char *);
+
+extern void fn3 (unsigned char, unsigned char, unsigned char, unsigned char,
+		 unsigned char, unsigned char, unsigned char, unsigned short);
+extern void fn7 (int);
+extern void fn8 (int);
+
+static __inline__ __attribute__ ((always_inline)) void
+fn1 (unsigned char arg0, unsigned char arg1, unsigned char arg2,
+     unsigned char arg3, unsigned char arg4, unsigned char arg5,
+     unsigned short arg6)
+{
+  asm volatile ("" :: "g" ((unsigned long long) arg0), "g" (arg1),
+		      "g" (arg2), "g" (arg3), "g" (arg4), "g" (arg5),
+		      "g" (arg6));
+  if (cond)
+    {
+      unsigned char loc0 = 0;
+      fn3 (loc0, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+    }
+}
+
+static __inline__ __attribute__ ((always_inline)) void
+fn4 (unsigned int arg0, unsigned long long arg1)
+{
+  asm volatile ("" :: "g" (arg0), "g" (arg1));
+}
+
+static __inline__ __attribute__ ((always_inline)) void
+fn5 (unsigned int arg0, unsigned char arg1, unsigned int arg2,
+     unsigned char arg3)
+{
+  asm volatile ("" :: "g" (arg0), "g" (arg1),
+		      "g" ((unsigned long long) arg2), "g" (arg3));
+}
+
+static __inline__ __attribute__ ((always_inline)) void
+fn6 (unsigned long long arg0, unsigned char arg1,
+     unsigned char arg2, signed short arg3,
+     unsigned int arg4, unsigned char * arg5)
+{
+  asm volatile ("" :: "g" (arg0), "g" ((unsigned long long) arg1),
+		      "g" ((unsigned long long) arg2), "g" (arg3),
+		      "g" (arg4), "g" (arg5));
+  if (cond)
+    {
+      unsigned char loc0 = 0;
+      fn0 (loc0, arg0, arg1, arg2, arg3, arg4, arg5);
+    }
+}
+
+unsigned char b[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa };
+unsigned int q = sizeof (b) / sizeof (b[0]);
+
+void
+foo ()
+{
+  int i;
+  for (i = 1; i <= 50; i++)
+    {
+      fn6 (i + 0x1234, i + 1, i + 0xa, i + 0x1234, q, b);
+      fn5 (i + 0xabcd, i << 1, i + 0x1234, i << 2);
+      fn7 (i + 0xdead);
+      fn8 (i + 0xdead);
+      fn1 (i, i + 1, i + 2, i + 3, i + 4, i + 5, i << 10);
+      fn4 (i + 0xfeed, i);
+    }
+}
+
+/* Verify no statements get the location of the foo () decl.  */
+/* { dg-final { scan-tree-dump-not " : 65:1\\\]" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */