mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 11:40:18 +02:00
Fix backtraces with call-with-values during bootstrap
* libguile/programs.c (scm_i_program_name): Use scm_i_primitive_name for primitives. No functional change though. * libguile/vm.c (DEFINE_BUILTIN): Mark builtins as primitives.
This commit is contained in:
parent
52248cf622
commit
4e5329676b
2 changed files with 6 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2001,2009-2014,2017-2018
|
||||
/* Copyright 2001,2009-2014,2017-2019
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of Guile.
|
||||
|
@ -60,7 +60,7 @@ scm_i_program_name (SCM program)
|
|||
static SCM program_name = SCM_BOOL_F;
|
||||
|
||||
if (SCM_PRIMITIVE_P (program))
|
||||
return SCM_SUBR_NAME (program);
|
||||
return scm_i_primitive_name (SCM_PROGRAM_CODE (program));
|
||||
|
||||
if (scm_is_false (program_name) && scm_module_system_booted_p)
|
||||
program_name =
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright 2001,2009-2015,2017-2018
|
||||
/* Copyright 2001,2009-2015,2017-2019
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of Guile.
|
||||
|
@ -484,7 +484,9 @@ define_vm_builtins (void)
|
|||
{ \
|
||||
size_t sz = sizeof (builtin##_code); \
|
||||
vm_builtin_##builtin##_code = instrumented_code (builtin##_code, sz); \
|
||||
vm_builtin_##builtin = scm_i_make_program (vm_builtin_##builtin##_code); \
|
||||
vm_builtin_##builtin = \
|
||||
scm_cell (scm_tc7_program | SCM_F_PROGRAM_IS_PRIMITIVE, \
|
||||
(scm_t_bits)vm_builtin_##builtin##_code); \
|
||||
}
|
||||
FOR_EACH_VM_BUILTIN (DEFINE_BUILTIN);
|
||||
#undef INDEX_TO_NAME
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue