summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-03-06 17:15:45 +0100
committerLudovic Courtès <ludo@gnu.org>2020-03-06 17:15:45 +0100
commitc5d3b45c9f903cc9726b4bd7e3c13db56bafd587 (patch)
treea111ec7ca6ac13bde96590f172c906449c1b6484
parent4cfe0c1014f2d238646c5d8d66d44ffb64ede54b (diff)
downloadguile-c5d3b45c9f903cc9726b4bd7e3c13db56bafd587.tar.gz
'hash' behaves like 'hashq' for tc7s without an 'equal?' implementation.
Fixes <https://bugs.gnu.org/39634>. * libguile/hash.c (scm_raw_ihash): Add cases for scm_tc7 values that were not explicitly listed.
-rw-r--r--libguile/hash.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/libguile/hash.c b/libguile/hash.c
index c51a794c9..9cb8fcedd 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -1,4 +1,4 @@
-/* Copyright 1995-1997,2000-2001,2003-2004,2006,2008-2015,2017-2018
+/* Copyright 1995-1997,2000-2001,2003-2004,2006,2008-2015,2017-2018,2020
Free Software Foundation, Inc.
This file is part of Guile.
@@ -331,6 +331,22 @@ scm_raw_ihash (SCM obj, size_t depth)
h ^= scm_raw_ihash (scm_syntax_module (obj), depth);
return h;
}
+
+ /* The following tc7s have no 'equal?' implementation. Thus, just
+ fall back to 'hashq'. */
+ case scm_tc7_variable:
+ case scm_tc7_hashtable:
+ case scm_tc7_fluid:
+ case scm_tc7_dynamic_state:
+ case scm_tc7_frame:
+ case scm_tc7_atomic_box:
+ case scm_tc7_program:
+ case scm_tc7_vm_cont:
+ case scm_tc7_weak_set:
+ case scm_tc7_weak_table:
+ case scm_tc7_port:
+ return scm_raw_ihashq (SCM_UNPACK (obj));
+
case scm_tcs_cons_imcar:
case scm_tcs_cons_nimcar:
if (depth)