[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp-macos-fixes 9e64a08: Merge branch 'feature/native-co
From: |
Vibhav Pant |
Subject: |
feature/native-comp-macos-fixes 9e64a08: Merge branch 'feature/native-comp' into feature/native-comp-macos-fixes |
Date: |
Fri, 14 Aug 2020 04:52:45 -0400 (EDT) |
branch: feature/native-comp-macos-fixes
commit 9e64a087c4d167e7ec1c4e22bea3e6af53b563de
Merge: 229c0c5 3882e8f
Author: Vibhav Pant <vibhavp@gmail.com>
Commit: Vibhav Pant <vibhavp@gmail.com>
Merge branch 'feature/native-comp' into feature/native-comp-macos-fixes
---
lisp/emacs-lisp/comp.el | 11 +++++++----
src/pdumper.c | 5 +++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 599d35b..a92392f 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2608,13 +2608,16 @@ display a message."
(message "Compiling %s..." ,source-file)
(native-compile ,source-file ,(and load t))))
(source-file1 source-file) ;; Make the closure works :/
- (_ (progn
- (comp-log "\n")
- (comp-log (prin1-to-string expr))))
(temp-file (make-temp-file
(concat "emacs-async-comp-"
(file-name-base source-file) "-")
- nil ".el" (prin1-to-string expr)))
+ nil ".el"))
+ (expr-string (prin1-to-string expr))
+ (_ (progn
+ (with-temp-file temp-file
+ (insert expr-string))
+ (comp-log "\n")
+ (comp-log expr-string)))
(load1 load)
(process (make-process
:name (concat "Compiling: " source-file)
diff --git a/src/pdumper.c b/src/pdumper.c
index 83410e3..629d096 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -5281,12 +5281,13 @@ dump_do_dump_relocation (const uintptr_t dump_base,
struct Lisp_Native_Comp_Unit *comp_u =
XNATIVE_COMP_UNIT (subr->native_comp_u[0]);
if (!comp_u->handle)
- error ("can't relocate native subr with not loaded compilation unit");
+ error ("NULL handle in compilation unit %s", SSDATA (comp_u->file));
const char *c_name = subr->native_c_name[0];
eassert (c_name);
void *func = dynlib_sym (comp_u->handle, c_name);
if (!func)
- error ("can't find function in compilation unit");
+ error ("can't find function \"%s\" in compilation unit %s", c_name,
+ SSDATA (comp_u->file));
subr->function.a0 = func;
Lisp_Object lambda_data_idx =
Fgethash (build_string (c_name), comp_u->lambda_c_name_idx_h, Qnil);