diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/expr.c | 23 |
2 files changed, 26 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 852028a..6cac0b8 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2007-11-26 Alexandre Oliva <aoliva@redhat.com> + + * expr.c (type_assertion_hash): Hash type uids rather than + tree pointers. + 2007-11-17 David Daney <ddaney@avtrex.com> Andrew Haley <aph@redhat.com> diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 1eceaad..8311fbc 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -433,8 +433,27 @@ type_assertion_hash (const void *p) const type_assertion *k_p = p; hashval_t hash = iterative_hash (&k_p->assertion_code, sizeof k_p->assertion_code, 0); - hash = iterative_hash (&k_p->op1, sizeof k_p->op1, hash); - return iterative_hash (&k_p->op2, sizeof k_p->op2, hash); + + switch (k_p->assertion_code) + { + case JV_ASSERT_TYPES_COMPATIBLE: + hash = iterative_hash (&TYPE_UID (k_p->op2), sizeof TYPE_UID (k_p->op2), + hash); + /* Fall through. */ + + case JV_ASSERT_IS_INSTANTIABLE: + hash = iterative_hash (&TYPE_UID (k_p->op1), sizeof TYPE_UID (k_p->op1), + hash); + /* Fall through. */ + + case JV_ASSERT_END_OF_TABLE: + break; + + default: + gcc_unreachable (); + } + + return hash; } /* Add an entry to the type assertion table for the given class. |