[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 43b40bc 3/3: Don't call _setjmp through a function p
From: |
Andrea Corallo |
Subject: |
feature/native-comp 43b40bc 3/3: Don't call _setjmp through a function pointer (Bug#46824) |
Date: |
Wed, 3 Mar 2021 14:36:36 -0500 (EST) |
branch: feature/native-comp
commit 43b40bc880f66cb3f48318ba3a480a76b149b815
Author: Pip Cet <pipcet@gmail.com>
Commit: Andrea Corallo <akrl@sdf.org>
Don't call _setjmp through a function pointer (Bug#46824)
* src/comp.c (helper_link_table): Don't include SETJMP except on Windows.
(emit_setjmp): Don't use function pointers except on Windows.
(declare_runtime_imported_funcs): Don't import SETJMP at runtime.
(ABI_VERSION): Bump.
* test/src/comp-tests.el (46824-1): New test.
* test/src/comp-test-funcs.el (comp-test-46824-1-f): New function.
---
src/comp.c | 24 +++++++++++++++++-------
test/src/comp-test-funcs.el | 18 +++++++++++++++++-
test/src/comp-tests.el | 6 +++++-
3 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/src/comp.c b/src/comp.c
index bcffd42..bc45859 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -422,7 +422,7 @@ load_gccjit_if_necessary (bool mandatory)
/* Increase this number to force a new Vcomp_abi_hash to be generated. */
-#define ABI_VERSION "1"
+#define ABI_VERSION "2"
/* Length of the hashes used for eln file naming. */
#define HASH_LENGTH 8
@@ -646,7 +646,9 @@ void *helper_link_table[] =
helper_PSEUDOVECTOR_TYPEP_XUNTAG,
pure_write_error,
push_handler,
+#ifdef WINDOWSNT
SETJMP_NAME,
+#endif
record_unwind_protect_excursion,
helper_unbind_n,
helper_save_restriction,
@@ -1935,8 +1937,19 @@ emit_setjmp (gcc_jit_rvalue *buf)
{
#ifndef WINDOWSNT
gcc_jit_rvalue *args[] = {buf};
- return emit_call (intern_c_string (STR (SETJMP_NAME)), comp.int_type, 1,
args,
- false);
+ gcc_jit_param *params[] =
+ {
+ gcc_jit_context_new_param (comp.ctxt, NULL, comp.void_ptr_type, "buf"),
+ };
+ /* Don't call setjmp through a function pointer (Bug#46824) */
+ gcc_jit_function *f =
+ gcc_jit_context_new_function (comp.ctxt, NULL,
+ GCC_JIT_FUNCTION_IMPORTED,
+ comp.int_type, STR (SETJMP_NAME),
+ ARRAYELTS (params), params,
+ false);
+
+ return gcc_jit_context_new_call (comp.ctxt, NULL, f, 1, args);
#else
/* _setjmp (buf, __builtin_frame_address (0)) */
gcc_jit_rvalue *args[2];
@@ -2668,10 +2681,7 @@ declare_runtime_imported_funcs (void)
args[1] = comp.int_type;
ADD_IMPORTED (push_handler, comp.handler_ptr_type, 2, args);
-#ifndef WINDOWSNT
- args[0] = gcc_jit_type_get_pointer (gcc_jit_struct_as_type (comp.jmp_buf_s));
- ADD_IMPORTED (SETJMP_NAME, comp.int_type, 1, args);
-#else
+#ifdef WINDOWSNT
args[0] = gcc_jit_type_get_pointer (gcc_jit_struct_as_type (comp.jmp_buf_s));
args[1] = comp.void_ptr_type;
ADD_IMPORTED (SETJMP_NAME, comp.int_type, 2, args);
diff --git a/test/src/comp-test-funcs.el b/test/src/comp-test-funcs.el
index a465026..08aa6bb 100644
--- a/test/src/comp-test-funcs.el
+++ b/test/src/comp-test-funcs.el
@@ -1,6 +1,6 @@
;;; comp-test-funcs.el --- compilation unit tested by comp-tests.el -*-
lexical-binding: t; -*-
-;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2021 Free Software Foundation, Inc.
;; Author: Andrea Corallo <akrl@sdf.org>
@@ -485,6 +485,22 @@
(and (equal (comp-test-46670-1-f (length s)) s)
s))
+(cl-defun comp-test-46824-1-f ()
+ (let ((next-repos '(1)))
+ (while t
+ (let ((recipe (car next-repos)))
+ (cl-block loop
+ (while t
+ (let ((err
+ (condition-case e
+ (progn
+ (setq next-repos
+ (cdr next-repos))
+ (cl-return-from loop))
+ (error e))))
+ (format "%S"
+ (error-message-string err))))))
+ (cl-return-from comp-test-46824-1-f))))
;;;;;;;;;;;;;;;;;;;;
;; Tromey's tests ;;
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 3f007d2..dae2abc 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -1,6 +1,6 @@
;;; comp-tests.el --- unit tests for src/comp.c -*- lexical-binding: t;
-*-
-;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2021 Free Software Foundation, Inc.
;; Author: Andrea Corallo <akrl@sdf.org>
@@ -503,6 +503,10 @@
https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html."
(should (equal (subr-type (symbol-function #'comp-test-46670-2-f))
'(function (t) (or null sequence)))))
+(comp-deftest 46824-1 ()
+ "<https://lists.gnu.org/archive/html/bug-gnu-emacs/2021-02/msg01949.html>"
+ (should (equal (comp-test-46824-1-f) nil)))
+
;;;;;;;;;;;;;;;;;;;;;
;; Tromey's tests. ;;