re PR tree-optimization/36830 (STORAGE_ERROR raised compiling s-os_lib.adb)

	PR tree-optimization/36830
	* tree-ssa-sccvn.c (vn_reference_op_compute_hash): Hash operand #2.
	(expressions_equal_p): Return false if only one operand is null.

From-SVN: r138191

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 116c3c1067b95f8425a7eb2305e256b98cbc86e8..c69e60ebd5e9d818417201849eac0b6cf31d1aed 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR tree-optimization/36830
+       * tree-ssa-sccvn.c (vn_reference_op_compute_hash): Hash operand #2.
+       (expressions_equal_p): Return false if only one operand is null.
+
 2008-07-26  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * doc/install.texi (powerpc-*-netbsd*): Remove redundant texinfo

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 48b5297b4d80d9a3bf1d4f6bc067077658ed4fad..85ceb7e935c935eaf6c6e3b942d06399068666ee 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -319,7 +319,8 @@ static hashval_t
 vn_reference_op_compute_hash (const vn_reference_op_t vro1)
 {
   return iterative_hash_expr (vro1->op0, vro1->opcode)
-    + iterative_hash_expr (vro1->op1, vro1->opcode);
+    + iterative_hash_expr (vro1->op1, vro1->opcode)
+    + iterative_hash_expr (vro1->op2, vro1->opcode);
 }
 
 /* Return the hashcode for a given reference operation P1.  */
@@ -2587,22 +2588,24 @@ get_next_value_id (void)
 }
 
 
-/* Compare two expressions E1 and E2 and return true if they are
-   equal.  */
+/* Compare two expressions E1 and E2 and return true if they are equal.  */
 
 bool
 expressions_equal_p (tree e1, tree e2)
 {
-  tree te1, te2;
-
+  /* The obvious case.  */
   if (e1 == e2)
     return true;
 
-  te1 = TREE_TYPE (e1);
-  te2 = TREE_TYPE (e2);
-  if (te1 != te2)
+  /* If only one of them is null, they cannot be equal.  */
+  if (!e1 || !e2)
+    return false;
+
+  /* Likewise if they are not of the same type.  */
+  if (TREE_TYPE (e1) != TREE_TYPE (e2))
     return false;
 
+  /* Recurse on elements of lists.  */
   if (TREE_CODE (e1) == TREE_LIST && TREE_CODE (e2) == TREE_LIST)
     {
       tree lop1 = e1;
@@ -2617,10 +2620,11 @@ expressions_equal_p (tree e1, tree e2)
            return false;
        }
       return true;
-
     }
-  else if (TREE_CODE (e1) == TREE_CODE (e2)
-          && operand_equal_p (e1, e2, OEP_PURE_SAME))
+
+  /* Now perform the actual comparison.  */
+  if (TREE_CODE (e1) == TREE_CODE (e2)
+      && operand_equal_p (e1, e2, OEP_PURE_SAME))
     return true;
 
   return false;