From: Andrea Corallo <akrl@sdf.org>
Date: Sat, 9 May 2020 18:07:35 +0000 (+0100)
Subject: * Fix --enable-check-lisp-object-type GNU/Linux X86_64 build
X-Git-Tag: emacs-28.0.90~2727^2~658
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd8be64ce3f314c152d009f5bf88bcfadf6daef7;p=emacs.git

* Fix --enable-check-lisp-object-type GNU/Linux X86_64 build

	* src/comp.c (emit_mvar_val): Fix missing use of XLP macro.
	(load_comp_unit): Fix missing use of NILP macro.
---

diff --git a/src/comp.c b/src/comp.c
index d021be479b0..768172b3aa1 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -1343,7 +1343,7 @@ emit_mvar_val (Lisp_Object mvar)
 	  word =
 	    gcc_jit_context_new_rvalue_from_ptr (comp.ctxt,
 						 comp.void_ptr_type,
-						 constant);
+						 XLP (constant));
 #endif
 	  return emit_coerce (comp.lisp_obj_type, word);
 	}
@@ -3564,7 +3564,7 @@ load_comp_unit (struct Lisp_Native_Comp_Unit *comp_u, bool loading_dump,
   Lisp_Object *saved_cu = dynlib_sym (handle, COMP_UNIT_SYM);
   if (!saved_cu)
     xsignal1 (Qnative_lisp_file_inconsistent, comp_u->file);
-  bool reloading_cu = *saved_cu ? true : false;
+  bool reloading_cu = !NILP (*saved_cu) ? true : false;
   Lisp_Object *data_eph_relocs =
     dynlib_sym (handle, DATA_RELOC_EPHEMERAL_SYM);