luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/revert-2924' into 'glib-2-74'

Browse Source 
Revert !2924 in 2.74.x branch

See merge request GNOME/glib!2995
This commit is contained in:
Philip Withnall 2022-10-21 12:02:25 +00:00
commit d38268c086
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/ghash.c
View File

@ -2494,7 +2494,7 @@ g_int64_equal (gconstpointer v1,
guint
g_int64_hash (gconstpointer v)
{
return (guint) ((const guint) (*(guint64 *) v >> 32)) ^ (*(const guint *) v);
return (guint) *(const gint64*) v;
}
/**
@ -2535,5 +2535,5 @@ g_double_equal (gconstpointer v1,
guint
g_double_hash (gconstpointer v)
{
return (guint) ((const guint) (*(guint64 *) v >> 32)) ^ (*(const guint *) v);
return (guint) *(const gdouble*) v;
}

36
glib/tests/hash.c
View File

@ -459,19 +459,6 @@ int64_hash_test (void)
g_hash_table_destroy (h);
}
static void
int64_hash_collision_test (void)
{
gint64 m;
gint64 n;
g_test_summary ("Check int64 Hash collisions caused by ignoring high word");
m = 722;
n = ((gint64) 2003 << 32) + 722;
g_assert_cmpuint (g_int64_hash (&m), !=, g_int64_hash (&n));
}
static void
double_hash_test (void)
{
@ -501,27 +488,6 @@ double_hash_test (void)
g_hash_table_destroy (h);
}
static void
double_hash_collision_test (void)
{
gdouble m;
gdouble n;
g_test_summary ("Check double Hash collisions caused by int conversion " \
"and by numbers larger than 2^64-1 (G_MAXUINT64)");
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2771");
/* Equal when directly converted to integers */
m = 0.1;
n = 0.2;
g_assert_cmpuint (g_double_hash (&m), !=, g_double_hash (&n));
/* Numbers larger than 2^64-1 (G_MAXUINT64) */
m = 1e100;
n = 1e200;
g_assert_cmpuint (g_double_hash (&m), !=, g_double_hash (&n));
}
static void
string_free (gpointer data)
{
@ -1749,9 +1715,7 @@ main (int argc, char *argv[])
g_test_add_func ("/hash/direct2", direct_hash_test2);
g_test_add_func ("/hash/int", int_hash_test);
g_test_add_func ("/hash/int64", int64_hash_test);
g_test_add_func ("/hash/int64/collisions", int64_hash_collision_test);
g_test_add_func ("/hash/double", double_hash_test);
g_test_add_func ("/hash/double/collisions", double_hash_collision_test);
g_test_add_func ("/hash/string", string_hash_test);
g_test_add_func ("/hash/set", set_hash_test);
g_test_add_func ("/hash/set-ref", set_ref_hash_test);