diff options
| author | Andy Wingo <wingo@pobox.com> | 2023-05-07 09:49:00 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2023-05-07 09:50:14 +0200 |
| commit | 6efc0b8159f0fc74c0eafec988fe5434fb4d9f51 (patch) | |
| tree | a95fe79f8b252acffaeb9f85fe3caaec9a06c0be /libguile | |
| parent | fe6cc6d04ab094ea802907bdc4f728416c0e97ba (diff) | |
| download | guile-6efc0b8159f0fc74c0eafec988fe5434fb4d9f51.tar.gz | |
call-with-values builtin doesn't leave garbage on the stack
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.
Diffstat (limited to 'libguile')
| -rw-r--r-- | libguile/vm.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libguile/vm.c b/libguile/vm.c index b565db970..36138f0d5 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -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) }; |