Use ad-hoc comparison function for the profiler's hash-tables.

* src/profiler.c (Qprofiler_backtrace_equal, hashtest_profiler): New vars.
(make_log): Use them.
(handle_profiler_signal): Don't inhibit quit any longer since we don't
call Fequal any more.
(Ffunction_equal): New function.
(cmpfn_profiler, hashfn_profiler): New functions.
(syms_of_profiler): Initialize them.
* src/lisp.h (struct hash_table_test): New struct.
(struct Lisp_Hash_Table): Use it.
* src/alloc.c (mark_object): Mark hash_table_test fields of hash tables.
* src/fns.c (make_hash_table): Take a struct to describe the test.
(cmpfn_eql, cmpfn_equal, cmpfn_user_defined, hashfn_eq, hashfn_eql)
(hashfn_equal, hashfn_user_defined): Adjust to new calling convention.
(hash_lookup, hash_remove_from_table): Move assertion checking of
hashfn result here.  Check hash-equality before calling cmpfn.
(Fmake_hash_table): Adjust call to make_hash_table.
(hashtest_eq, hashtest_eql, hashtest_equal): New structs.
(syms_of_fns): Initialize them.
* src/emacs.c (main): Move syms_of_fns earlier.
* src/xterm.c (syms_of_xterm):
* src/category.c (hash_get_category_set): Adjust call to make_hash_table.
* src/print.c (print_object): Adjust to new hash-table struct.
* src/composite.c (composition_gstring_put_cache): Adjust to new hashfn.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/print.c b/src/print.c
index ccf0e8ed7cc..af6eda7298f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1815,14 +1815,14 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
 #endif
           /* Implement a readable output, e.g.:
             #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */
-          /* Always print the size. */
+          /* Always print the size.  */
           len = sprintf (buf, "#s(hash-table size %"pD"d", ASIZE (h->next));
           strout (buf, len, len, printcharfun);
 
-          if (!NILP (h->test))
+          if (!NILP (h->test.name))
             {
               strout (" test ", -1, -1, printcharfun);
-              print_object (h->test, printcharfun, escapeflag);
+              print_object (h->test.name, printcharfun, escapeflag);
             }
 
           if (!NILP (h->weak))