summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/gimple.c8
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18658784acd..88f78305f8d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-14 Richard Guenther <rguenther@suse.de>
+
+ PR lto/42665
+ * gimple.c (iterative_hash_gimple_type): Avoid hashing
+ error_mark_node.
+
2010-01-14 Ira Rosen <irar@il.ibm.com>
PR tree-optimization/42709
diff --git a/gcc/gimple.c b/gcc/gimple.c
index 3ee15b56989..dce5ba59fb7 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -3707,8 +3707,12 @@ iterative_hash_gimple_type (tree type, hashval_t val,
/* For integer types hash the types min/max values and the string flag. */
if (TREE_CODE (type) == INTEGER_TYPE)
{
- v = iterative_hash_expr (TYPE_MIN_VALUE (type), v);
- v = iterative_hash_expr (TYPE_MAX_VALUE (type), v);
+ /* OMP lowering can introduce error_mark_node in place of
+ random local decls in types. */
+ if (TYPE_MIN_VALUE (type) != error_mark_node)
+ v = iterative_hash_expr (TYPE_MIN_VALUE (type), v);
+ if (TYPE_MAX_VALUE (type) != error_mark_node)
+ v = iterative_hash_expr (TYPE_MAX_VALUE (type), v);
v = iterative_hash_hashval_t (TYPE_STRING_FLAG (type), v);
}