re PR c++/56493 (Performance regression in google dense hashmap)

	PR c++/56493
	* convert.c (convert_to_real, convert_to_expr, convert_to_complex):
	Handle COMPOUND_EXPR.

	* c-c++-common/pr56493.c: New test.

From-SVN: r218345

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 266bbfe0d0c119bfdf09a333601f41c0514386ee..d4fd9cbd5a581bd534a6b3cbe87fbb447821e80b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/56493
+       * convert.c (convert_to_real, convert_to_expr, convert_to_complex):
+       Handle COMPOUND_EXPR.
+
 2014-12-04  Richard Biener  <rguenther@suse.de>
 
        * builtins.c (target_newline): Export.

diff --git a/gcc/convert.c b/gcc/convert.c
index 07e2d75e5ee49d0847629aa242b66debb98ccf21..00907290c211479b2e4f492f3c19c36b7b4c0b06 100644 (file)
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -99,6 +99,15 @@ convert_to_real (tree type, tree expr)
   enum built_in_function fcode = builtin_mathfn_code (expr);
   tree itype = TREE_TYPE (expr);
 
+  if (TREE_CODE (expr) == COMPOUND_EXPR)
+    {
+      tree t = convert_to_real (type, TREE_OPERAND (expr, 1));
+      if (t == TREE_OPERAND (expr, 1))
+       return expr;
+      return build2_loc (EXPR_LOCATION (expr), COMPOUND_EXPR, TREE_TYPE (t),
+                        TREE_OPERAND (expr, 0), t);
+    }    
+
   /* Disable until we figure out how to decide whether the functions are
      present in runtime.  */
   /* Convert (float)sqrt((double)x) where x is float into sqrtf(x) */
@@ -406,6 +415,15 @@ convert_to_integer (tree type, tree expr)
       return error_mark_node;
     }
 
+  if (ex_form == COMPOUND_EXPR)
+    {
+      tree t = convert_to_integer (type, TREE_OPERAND (expr, 1));
+      if (t == TREE_OPERAND (expr, 1))
+       return expr;
+      return build2_loc (EXPR_LOCATION (expr), COMPOUND_EXPR, TREE_TYPE (t),
+                        TREE_OPERAND (expr, 0), t);
+    }    
+
   /* Convert e.g. (long)round(d) -> lround(d).  */
   /* If we're converting to char, we may encounter differing behavior
      between converting from double->char vs double->long->char.
@@ -926,6 +944,14 @@ convert_to_complex (tree type, tree expr)
 
        if (TYPE_MAIN_VARIANT (elt_type) == TYPE_MAIN_VARIANT (subtype))
          return expr;
+       else if (TREE_CODE (expr) == COMPOUND_EXPR)
+         {
+           tree t = convert_to_complex (type, TREE_OPERAND (expr, 1));
+           if (t == TREE_OPERAND (expr, 1))
+             return expr;
+           return build2_loc (EXPR_LOCATION (expr), COMPOUND_EXPR,
+                              TREE_TYPE (t), TREE_OPERAND (expr, 0), t);
+         }    
        else if (TREE_CODE (expr) == COMPLEX_EXPR)
          return fold_build2 (COMPLEX_EXPR, type,
                              convert (subtype, TREE_OPERAND (expr, 0)),

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 477600cc278943eb7c3f9b9094afbb1f4f4e5d42..06509c277f600133de961975995c35a2204ddaa5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/56493
+       * c-c++-common/pr56493.c: New test.
+
 2014-12-04  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * lib/target-supports.exp (check_effective_target_tiny): Cache

diff --git a/gcc/testsuite/c-c++-common/pr56493.c b/gcc/testsuite/c-c++-common/pr56493.c
new file mode 100644 (file)
index 0000000..4181260
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr56493.c
@@ -0,0 +1,16 @@
+/* PR c++/56493 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-gimple" } */
+
+unsigned long long bar (void);
+int x;
+
+void
+foo (void)
+{
+  x += bar ();
+}
+
+/* Verify we narrow the addition from unsigned long long to unsigned int type.  */
+/* { dg-final { scan-tree-dump "  (\[a-zA-Z._0-9]*) = \\(unsigned int\\) \[^;\n\r]*;.*  (\[a-zA-Z._0-9]*) = \\(unsigned int\\) \[^;\n\r]*;.* = \\1 \\+ \\2;" "gimple" { target { ilp32 || lp64 } } } } */
+/* { dg-final { cleanup-tree-dump "gimple" } } */