mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

call-with-values builtin doesn't leave garbage on the stack

Browse source 
Fixes https://debbugs.gnu.org/63279.  The issue was that if the producer
thunk caused a backtrace, pretty-printing the call-with-values frame
would segfault because there was an unininitialized slot on the stack.
For functions produced by the compiler this wouldn't be a problem
because there are stack maps, but primitives require that all slots on a
pending stack frame be packed (no uninitialized values) and tagged (all
SCM values, no unboxed values).

* test-suite/tests/error-handling.test: New test.
* test-suite/Makefile.am: Add new file.
* libguile/vm.c (define_vm_builtins): Fix call-with-values to have a
more compact stack.
This commit is contained in:
Andy Wingo 2023-05-07 09:49:00 +02:00
parent fe6cc6d04a
commit 6efc0b8159
3 changed files with 50 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libguile/vm.c
View file

@ -1,4 +1,4 @@
/* Copyright 2001,2009-2015,2017-2020,2022
/* Copyright 2001,2009-2015,2017-2020,2022-2023
Free Software Foundation, Inc.
This file is part of Guile.
@ -451,11 +451,12 @@ define_vm_builtins (void)
const uint32_t call_with_values_code[] = {
SCM_PACK_OP_24 (assert_nargs_ee, 3),
SCM_PACK_OP_24 (alloc_frame, 8),
SCM_PACK_OP_12_12 (mov, 0, 6),
SCM_PACK_OP_24 (call, 7), SCM_PACK_OP_ARG_8_24 (0, 1),
SCM_PACK_OP_24 (long_fmov, 0), SCM_PACK_OP_ARG_8_24 (0, 2),
SCM_PACK_OP_12_12 (shuffle_down, 7, 1),
SCM_PACK_OP_24 (alloc_frame, 6),
SCM_PACK_OP_12_12 (mov, 0, 4),
SCM_PACK_OP_12_12 (mov, 4, 3),
SCM_PACK_OP_24 (call, 5), SCM_PACK_OP_ARG_8_24 (0, 1),
SCM_PACK_OP_24 (long_fmov, 0), SCM_PACK_OP_ARG_8_24 (0, 1),
SCM_PACK_OP_12_12 (shuffle_down, 5, 1),
SCM_PACK_OP_24 (tail_call, 0)
};

11
test-suite/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in.
##
## Copyright 2001-2020 Software Foundation, Inc.
## Copyright 2001-2020, 2023 Software Foundation, Inc.
##
## This file is part of GUILE.
##
@ -43,14 +43,15 @@ SCM_TESTS = tests/00-initial-env.test \
tests/cross-compilation.test \
tests/curried-definitions.test \
tests/dwarf.test \
tests/encoding-escapes.test \
tests/encoding-iso88591.test \
tests/encoding-iso88597.test \
tests/encoding-utf8.test \
tests/ecmascript.test \
tests/elisp.test \
tests/elisp-compiler.test \
tests/elisp-reader.test \
tests/encoding-escapes.test \
tests/encoding-iso88591.test \
tests/encoding-iso88597.test \
tests/encoding-utf8.test \
tests/error-handling.test \
tests/eval.test \
tests/eval-string.test \
tests/exceptions.test \

37
test-suite/tests/error-handling.test Normal file
View file

@ -0,0 +1,37 @@
;;; Test for call-with-error-handling. -*- scheme -*-
;;; Copyright (C) 2023
;;; Free Software Foundation, Inc.
;;;
;;; This library is free software: you can redistribute it and/or modify
;;; it under the terms of the GNU Lesser General Public License as
;;; published by the Free Software Foundation, either version 3 of the
;;; License, or (at your option) any later version.
;;;
;;; This library is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;;; Lesser General Public License for more details.
;;;
;;; You should have received a copy of the GNU Lesser General Public
;;; License along with this program. If not, see
;;; <http://www.gnu.org/licenses/>.
(define-module (test-suite test-error-handling)
#:use-module (test-suite lib)
#:use-module (system base compile)
#:use-module (system repl error-handling))
(with-test-prefix "call-with-values"
(pass-if "backtrace with builtin"
(let* ((thunk (compile '(lambda ()
(symbol?
(call-with-values (lambda () (error 'oh-no))
list)))))
(str (with-output-to-string
(lambda ()
(call-with-error-handling thunk #:on-error 'backtrace))))
(lines (string-split str #\newline)))
;; For https://debbugs.gnu.org/63279, we just want to ensure that
;; the backtrace completes. The check is just that the backtrace
;; has at least a couple frames.
(>= (length lines) 4))))