From: Andrea Corallo <andrea_corallo@yahoo.it>
Date: Mon, 24 Jun 2019 11:45:44 +0000 (+0200)
Subject: fix XUNTAG
X-Git-Tag: emacs-28.0.90~2727^2~1433
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8c60ea884b835b7a109b735ee82600c7c785c5d;p=emacs.git

fix XUNTAG
---

diff --git a/src/comp.c b/src/comp.c
index 6f5ca5f4ecd..599f8f158b7 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -504,7 +504,7 @@ emit_rval_XUNTAG (gcc_jit_rvalue *a, gcc_jit_type *type, unsigned lisp_word_tag)
   /* #define XUNTAG(a, type, ctype) ((ctype *)
      ((char *) XLP (a) - LISP_WORD_TAG (type))) */
 
-  return emit_cast (type,
+  return emit_cast (gcc_jit_type_get_pointer (type),
 	   gcc_jit_context_new_binary_op (
 	     comp.ctxt,
 	     NULL,
@@ -512,8 +512,10 @@ emit_rval_XUNTAG (gcc_jit_rvalue *a, gcc_jit_type *type, unsigned lisp_word_tag)
 	     comp.emacs_int_type,
 	     emit_rval_XLI (a),
 	     gcc_jit_context_new_rvalue_from_int (comp.ctxt,
-					   comp.int_type,
-					   lisp_word_tag)));
+						  comp.emacs_int_type,
+						  lisp_word_tag)));
+}
+
 static gcc_jit_rvalue *
 emit_rval_XCONS (gcc_jit_rvalue *a)
 {