diff options
author | Paul N. Hilfinger <hilfinger@adacore.com> | 2010-10-07 08:32:36 +0000 |
---|---|---|
committer | Paul N. Hilfinger <hilfinger@adacore.com> | 2010-10-07 08:32:36 +0000 |
commit | 15ef70c19bfe9f903856764776e031ba6c3bb6fa (patch) | |
tree | 059c48a70286d6bb94a361601fa4c9c5d449b7b6 /gdb/dictionary.c | |
parent | c0ba854aa9cbdfa8f19402938771525fc9a6f62c (diff) | |
download | gdb-15ef70c19bfe9f903856764776e031ba6c3bb6fa.tar.gz |
Correct dict_hash to our most recent version.
Several changes to dict_hash from Adacore's local version were inadvertantly
left out of the last change to that function. These changes conservatively
cause dict_hash to revert to msymbol_hash_iw in more cases where the symbol
being hashed is known not to be Ada-encoded. This avoids a few cases where
the function hashes large groups of names with similar prefixes to the same
value.
Changelog:
gdb/
* dictionary.c (dict_hash): Revert to msymbol_hash_iw in
more cases.
Diffstat (limited to 'gdb/dictionary.c')
-rw-r--r-- | gdb/dictionary.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/gdb/dictionary.c b/gdb/dictionary.c index f3ac3069adb..4f18e8c0179 100644 --- a/gdb/dictionary.c +++ b/gdb/dictionary.c @@ -786,7 +786,7 @@ expand_hashtable (struct dictionary *dict) comparison operators hash to the same value. */ static unsigned int -dict_hash (const char *string) +dict_hash (const char *string0) { /* The Ada-encoded version of a name P1.P2...Pn has either the form P1__P2__...Pn<suffix> or _ada_P1__P2__...Pn<suffix> (where the Pi @@ -796,11 +796,18 @@ dict_hash (const char *string) does this for a superset of both valid Pi and of <suffix>, but in other cases it simply returns msymbol_hash_iw(STRING0). */ + const char *string; unsigned int hash; int c; - if (*string == '_' && strncmp (string, "_ada_", 5) == 0) - string += 5; + string = string0; + if (*string == '_') + { + if (strncmp (string, "_ada_", 5) == 0) + string += 5; + else + return msymbol_hash_iw (string0); + } hash = 0; while (*string) @@ -810,13 +817,15 @@ dict_hash (const char *string) case '$': case '.': case 'X': - case '(': - return hash; + if (string0 == string) + return msymbol_hash_iw (string0); + else + return hash; case ' ': - string += 1; - break; + case '(': + return msymbol_hash_iw (string0); case '_': - if (string[1] == '_') + if (string[1] == '_' && string != string0) { if (((c = string[2]) < 'a' || c > 'z') && c != 'O') return hash; |