Patchwork variably_modified_type_p tweak for cdtor cloning (PR debug/54828)

login
register
mail settings
Submitter Jakub Jelinek
Date Oct. 24, 2012, 9:09 a.m.
Message ID <20121024090950.GB1752@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/193712/
State New
Headers show

Comments

Jakub Jelinek - Oct. 24, 2012, 9:09 a.m.
On Wed, Oct 24, 2012 at 10:35:33AM +0200, Richard Biener wrote:
> Can you factor this and the variant in gimplify_one_sizepos out into
> a predicate? Like is_gimple_sizepos ()?
> 
> Ok with that change.

Here is what I've committed:

2012-10-24  Jakub Jelinek  <jakub@redhat.com>

	PR debug/54828
	* gimple.h (is_gimple_sizepos): New inline function.
	* gimplify.c (gimplify_one_sizepos): Use it.  Remove useless
	final assignment to expr variable.
	* tree.c (RETURN_TRUE_IF_VAR): Return true also if
	!TYPE_SIZES_GIMPLIFIED (type) and _t is going to be gimplified
	into a local temporary.

	* g++.dg/debug/pr54828.C: New test.


	Jakub

Patch

--- gcc/gimple.h.jj	2012-10-23 18:52:10.000000000 +0200
+++ gcc/gimple.h	2012-10-24 10:48:50.062669054 +0200
@@ -957,6 +957,24 @@  struct gimplify_ctx
   bool in_cleanup_point_expr;
 };
 
+/* Return true if gimplify_one_sizepos doesn't need to gimplify
+   expr (when in TYPE_SIZE{,_UNIT} and similar type/decl size/bitsize
+   fields).  */
+static inline bool
+is_gimple_sizepos (tree expr)
+{
+  /* gimplify_one_sizepos doesn't need to do anything if the value isn't there,
+     is constant, or contains A PLACEHOLDER_EXPR.  We also don't want to do
+     anything if it's already a VAR_DECL.  If it's a VAR_DECL from another
+     function, the gimplifier will want to replace it with a new variable,
+     but that will cause problems if this type is from outside the function.
+     It's OK to have that here.  */
+  return (expr == NULL_TREE
+	  || TREE_CONSTANT (expr)
+	  || TREE_CODE (expr) == VAR_DECL
+	  || CONTAINS_PLACEHOLDER_P (expr));
+}                                        
+
 extern enum gimplify_status gimplify_expr (tree *, gimple_seq *, gimple_seq *,
 					   bool (*) (tree), fallback_t);
 extern void gimplify_type_sizes (tree, gimple_seq *);
--- gcc/gimplify.c.jj	2012-10-17 17:18:21.000000000 +0200
+++ gcc/gimplify.c	2012-10-24 10:50:07.032204700 +0200
@@ -8147,15 +8147,12 @@  gimplify_one_sizepos (tree *expr_p, gimp
      a VAR_DECL.  If it's a VAR_DECL from another function, the gimplifier
      will want to replace it with a new variable, but that will cause problems
      if this type is from outside the function.  It's OK to have that here.  */
-  if (expr == NULL_TREE || TREE_CONSTANT (expr)
-      || TREE_CODE (expr) == VAR_DECL
-      || CONTAINS_PLACEHOLDER_P (expr))
+  if (is_gimple_sizepos (expr))
     return;
 
   *expr_p = unshare_expr (expr);
 
   gimplify_expr (expr_p, stmt_p, NULL, is_gimple_val, fb_rvalue);
-  expr = *expr_p;
 }
 
 /* Gimplify the body of statements of FNDECL and return a GIMPLE_BIND node
--- gcc/tree.c.jj	2012-10-23 18:52:03.455219291 +0200
+++ gcc/tree.c	2012-10-24 10:51:51.483574589 +0200
@@ -8467,14 +8467,19 @@  variably_modified_type_p (tree type, tre
   tree t;
 
 /* Test if T is either variable (if FN is zero) or an expression containing
-   a variable in FN.  */
+   a variable in FN.  If TYPE isn't gimplified, return true also if
+   gimplify_one_sizepos would gimplify the expression into a local
+   variable.  */
 #define RETURN_TRUE_IF_VAR(T)						\
   do { tree _t = (T);							\
     if (_t != NULL_TREE							\
 	&& _t != error_mark_node					\
 	&& TREE_CODE (_t) != INTEGER_CST				\
 	&& TREE_CODE (_t) != PLACEHOLDER_EXPR				\
-	&& (!fn || walk_tree (&_t, find_var_from_fn, fn, NULL)))	\
+	&& (!fn								\
+	    || (!TYPE_SIZES_GIMPLIFIED (type)				\
+		&& !is_gimple_sizepos (_t))				\
+	    || walk_tree (&_t, find_var_from_fn, fn, NULL)))		\
       return true;  } while (0)
 
   if (type == error_mark_node)
--- gcc/testsuite/g++.dg/debug/pr54828.C.jj	2012-10-24 10:44:31.179231097 +0200
+++ gcc/testsuite/g++.dg/debug/pr54828.C	2012-10-24 10:44:31.180231091 +0200
@@ -0,0 +1,14 @@ 
+// PR debug/54828
+// { dg-do compile }
+// { dg-options "-g" }
+
+struct T { T (); virtual ~T (); };
+struct S : public virtual T { S (); virtual ~S (); };
+int v;
+void foo (char *);
+
+S::S ()
+{
+  char s[v];
+  foo (s);
+}