re PR tree-optimization/39713 (ICE in get_expr_value_id)

2009-04-11  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/39713
	* tree-ssa-sccvn.c (vn_get_expr_for): Make sure built
	reference trees have SSA_NAME operands.

	* g++.dg/torture/pr39713.C: New testcase.

From-SVN: r145951

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 59c28c90dad53918e14043be308444142bc7c0e1..3d6b046edc5ddd95ba04a1eb147e14d7bab7c620 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-11  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/39713
+       * tree-ssa-sccvn.c (vn_get_expr_for): Make sure built
+       reference trees have SSA_NAME operands.
+
 2009-04-11  Richard Guenther  <rguenther@suse.de>
 
        PR c/39712

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f74dad28e4b143b800980e283f2ee06ea00c7453..bcd3c2bfa5f9c5e1dead82739a9712ba4dfc4661 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-11  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/39713
+       * g++.dg/torture/pr39713.C: New testcase.
+
 2009-04-10  Richard Guenther  <rguenther@suse.de>
 
        PR c/39712

diff --git a/gcc/testsuite/g++.dg/torture/pr39713.C b/gcc/testsuite/g++.dg/torture/pr39713.C
new file mode 100644 (file)
index 0000000..4ff72d1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr39713.C
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+
+template <typename To, typename From>
+static inline To
+bitwise_cast (From from)
+{
+  union
+    {
+      From f;
+      To t;
+    } u;
+  u.f = from;
+  return u.t;
+}
+
+extern void foo (unsigned char *);
+
+double
+bar ()
+{
+  unsigned char b[sizeof (unsigned long long)];
+  foo (b);
+  return bitwise_cast<double> (*(unsigned long long *) b);
+}
+

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 416fa7f69a631b435931131ef917f3bcf62b38b5..f3b00e99b48826756e979e20ff941c530451aed8 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -257,9 +257,10 @@ vn_get_expr_for (tree name)
   switch (TREE_CODE_CLASS (gimple_assign_rhs_code (def_stmt)))
     {
     case tcc_reference:
-      if (gimple_assign_rhs_code (def_stmt) == VIEW_CONVERT_EXPR
-         || gimple_assign_rhs_code (def_stmt) == REALPART_EXPR
-         || gimple_assign_rhs_code (def_stmt) == IMAGPART_EXPR)
+      if ((gimple_assign_rhs_code (def_stmt) == VIEW_CONVERT_EXPR
+          || gimple_assign_rhs_code (def_stmt) == REALPART_EXPR
+          || gimple_assign_rhs_code (def_stmt) == IMAGPART_EXPR)
+         && TREE_CODE (gimple_assign_rhs1 (def_stmt)) == SSA_NAME)
        expr = fold_build1 (gimple_assign_rhs_code (def_stmt),
                            gimple_expr_type (def_stmt),
                            TREE_OPERAND (gimple_assign_rhs1 (def_stmt), 0));