summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVibhav Pant <vibhavp@gmail.com>2017-02-09 19:12:59 +0530
committerVibhav Pant <vibhavp@gmail.com>2017-02-09 19:12:59 +0530
commit13eabbd80b121d0b86de55321bd5dda5d99fb857 (patch)
tree471c3bfee23c6e1b429f1f85d597f49b637f771d /src
parent3189f954ebdf739831a40e1b336505da60ea66c6 (diff)
downloademacs-13eabbd80b121d0b86de55321bd5dda5d99fb857.tar.gz
bytecode.c (exec_byte_code): Use h->count instead of HASH_TABLE_SIZE
Diffstat (limited to 'src')
-rw-r--r--src/bytecode.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/bytecode.c b/src/bytecode.c
index fb10a6d6914..299c651b90e 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1425,10 +1425,17 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
#endif
ptrdiff_t i;
struct Lisp_Hash_Table *h = XHASH_TABLE(jmp_table);
- if (HASH_TABLE_SIZE (h) <= 5)
+
+#ifdef BYTE_CODE_SAFE
+ /* Hash tables for switch are declared with :size set to exact
+ number of cases, so this should always be true. */
+ eassert (HASH_TABLE_SIZE (h) == h->count);
+#endif
+
+ if (h->count <= 5)
{ /* Do a linear search if there are not many cases
FIXME: 5 is arbitrarily chosen. */
- for (i = 0; i < HASH_TABLE_SIZE (h); i++)
+ for (i = 0; i < h->count; i++)
{
#ifdef BYTE_CODE_SAFE
eassert (!NILP (HASH_HASH (h, i)));