Move function reloc data into pure space during bootstrap

1 files changed, 24 insertions, 13 deletions

diff --git a/src/comp.c b/src/comp.c
index bb8b952cf52..0d1f83eb8ff 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -883,7 +883,7 @@ emit_make_fixnum (gcc_jit_rvalue *obj)
 }
 
 static gcc_jit_rvalue *
-emit_const_lisp_obj (Lisp_Object obj)
+emit_const_lisp_obj (Lisp_Object obj, Lisp_Object impure)
 {
   emit_comment (format_string ("const lisp obj: %s",
                                SSDATA (Fprin1_to_string (obj, Qnil))));
@@ -895,11 +895,13 @@ emit_const_lisp_obj (Lisp_Object obj)
                                                            NULL));
 
   Lisp_Object d_reloc_idx = CALL1I (comp-ctxt-data-relocs-idx, Vcomp_ctxt);
-  ptrdiff_t reloc_fixn = XFIXNUM (Fgethash (obj, d_reloc_idx, Qnil));
+  Lisp_Object packed_obj = Fcons (impure, obj);
+  Lisp_Object reloc_idx = Fgethash (packed_obj, d_reloc_idx, Qnil);
+  eassert (!NILP (reloc_idx));
   gcc_jit_rvalue *reloc_n =
     gcc_jit_context_new_rvalue_from_int (comp.ctxt,
                                          comp.ptrdiff_type,
-                                         reloc_fixn);
+                                         XFIXNUM (reloc_idx));
   return
     gcc_jit_lvalue_as_rvalue (
       gcc_jit_context_new_array_access (comp.ctxt,
@@ -912,7 +914,7 @@ static gcc_jit_rvalue *
 emit_NILP (gcc_jit_rvalue *x)
 {
   emit_comment ("NILP");
-  return emit_EQ (x, emit_const_lisp_obj (Qnil));
+  return emit_EQ (x, emit_const_lisp_obj (Qnil, Qnil));
 }
 
 static gcc_jit_rvalue *
@@ -1015,7 +1017,7 @@ emit_CHECK_CONS (gcc_jit_rvalue *x)
 
   gcc_jit_rvalue *args[] =
     { emit_CONSP (x),
-      emit_const_lisp_obj (Qconsp),
+      emit_const_lisp_obj (Qconsp, Qnil),
       x };
 
   gcc_jit_block_add_eval (
@@ -1126,7 +1128,7 @@ emit_mvar_val (Lisp_Object mvar)
           return emit_cast (comp.lisp_obj_type, word);
         }
       /* Other const objects are fetched from the reloc array.  */
-      return emit_const_lisp_obj (constant);
+      return emit_const_lisp_obj (constant, CALL1I (comp-mvar-impure, mvar));
     }
 
   return gcc_jit_lvalue_as_rvalue (get_slot (mvar));
@@ -1161,7 +1163,7 @@ emit_set_internal (Lisp_Object args)
   gcc_jit_rvalue *gcc_args[4];
   FOR_EACH_TAIL (args)
     gcc_args[i++] = emit_mvar_val (XCAR (args));
-  gcc_args[2] = emit_const_lisp_obj (Qnil);
+  gcc_args[2] = emit_const_lisp_obj (Qnil, Qnil);
   gcc_args[3] = gcc_jit_context_new_rvalue_from_int (comp.ctxt,
                                                      comp.int_type,
                                                      SET_INTERNAL_SET);
@@ -2360,11 +2362,11 @@ define_CAR_CDR (void)
       comp.block = is_nil_b;
       gcc_jit_block_end_with_return (comp.block,
                                      NULL,
-                                     emit_const_lisp_obj (Qnil));
+                                     emit_const_lisp_obj (Qnil, Qnil));
 
       comp.block = not_nil_b;
       gcc_jit_rvalue *wrong_type_args[] =
-        { emit_const_lisp_obj (Qlistp), c };
+        { emit_const_lisp_obj (Qlistp, Qnil), c };
 
       gcc_jit_block_add_eval (comp.block,
                               NULL,
@@ -2373,7 +2375,7 @@ define_CAR_CDR (void)
                                          false));
       gcc_jit_block_end_with_return (comp.block,
                                      NULL,
-                                     emit_const_lisp_obj (Qnil));
+                                     emit_const_lisp_obj (Qnil, Qnil));
     }
   comp.car = func[0];
   comp.cdr = func[1];
@@ -2753,12 +2755,12 @@ define_bool_to_lisp_obj (void)
   comp.block = ret_t_block;
   gcc_jit_block_end_with_return (ret_t_block,
                                  NULL,
-                                 emit_const_lisp_obj (Qt));
+                                 emit_const_lisp_obj (Qt, Qnil));
 
   comp.block = ret_nil_block;
   gcc_jit_block_end_with_return (ret_nil_block,
                                  NULL,
-                                 emit_const_lisp_obj (Qnil));
+                                 emit_const_lisp_obj (Qnil, Qnil));
 
 }
 
@@ -3285,8 +3287,17 @@ load_comp_unit (struct Lisp_Native_Comp_Unit *comp_u, bool loading_dump)
 
   EMACS_INT d_vec_len = XFIXNUM (Flength (comp_u->data_vec));
 
+  if (!loading_dump && !NILP (Vpurify_flag))
+    for (EMACS_INT i = 0; i < d_vec_len; i++)
+      {
+        Lisp_Object packed_obj = AREF (comp_u->data_vec, i);
+        if (NILP (XCAR (packed_obj)))
+          /* If is not impure can be copied into pure space.  */
+          XSETCDR (packed_obj, Fpurecopy (XCDR (packed_obj)));
+      }
+
   for (EMACS_INT i = 0; i < d_vec_len; i++)
-    data_relocs[i] = AREF (comp_u->data_vec, i);
+    data_relocs[i] = XCDR (AREF (comp_u->data_vec, i));
 
   if (!loading_dump)
     {