Move pure+side-effect-free declarations to byte-opt.el

* src/json.c (syms_of_json): Move pure and side-effect-free declarations
for json-serialize and json-parse-string from here...
* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns, pure-fns):
...to here.

(cherry picked from commit bef0d80be88906b66dec06970d7782f0f7b219c0)

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 5bc444f5abaa56f461082d4e429b3a3f2a6b15af..13be34d347950c40f9083718c6a3cb5c758f2c05 100644 (file)
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1702,6 +1702,8 @@ See Info node `(elisp) Integer Basics'."
          tool-bar-pixel-width window-system
          ;; fringe.c
          fringe-bitmaps-at-pos
+         ;; json.c
+         json-serialize json-parse-string
          ;; keyboard.c
          posn-at-point posn-at-x-y
          ;; keymap.c
@@ -1892,6 +1894,8 @@ See Info node `(elisp) Integer Basics'."
          length> member memq memql nth nthcdr proper-list-p rassoc rassq
          safe-length string-bytes string-distance string-equal string-lessp
          string-search string-version-lessp take value<
+         ;; json.c
+         json-serialize json-parse-string
          ;; search.c
          regexp-quote
          ;; syntax.c

diff --git a/src/json.c b/src/json.c
index 282dca6e8ffb66465ea82c89be55424391b1fde6..3368c52ef2ad843a9386dd2a103ce64b1fcf847e 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1818,16 +1818,6 @@ syms_of_json (void)
   define_error (Qjson_escape_sequence_error,
                "invalid escape sequence", Qjson_parse_error);
 
-  DEFSYM (Qpure, "pure");
-  DEFSYM (Qside_effect_free, "side-effect-free");
-
-  DEFSYM (Qjson_serialize, "json-serialize");
-  DEFSYM (Qjson_parse_string, "json-parse-string");
-  Fput (Qjson_serialize, Qpure, Qt);
-  Fput (Qjson_serialize, Qside_effect_free, Qt);
-  Fput (Qjson_parse_string, Qpure, Qt);
-  Fput (Qjson_parse_string, Qside_effect_free, Qt);
-
   DEFSYM (QCobject_type, ":object-type");
   DEFSYM (QCarray_type, ":array-type");
   DEFSYM (QCnull_object, ":null-object");