mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 14:21:10 +02:00
Code Activity

RTL VM: Fix variable lookup before modules boot

Browse source 
* libguile/vm-engine.c (toplevel-box, module-box): Handle the case where
  the module system isn't booted yet.
This commit is contained in:
Andy Wingo 2013-10-23 10:03:17 +02:00
parent db07176665
commit e23f9e4423
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/vm-engine.c
View file

@ -2220,6 +2220,11 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
mod = *((SCM *) mod_loc); mod = *((SCM *) mod_loc);
sym = *((SCM *) sym_loc); sym = *((SCM *) sym_loc);
/* If the toplevel scope was captured before modules were
booted, use the root module. */
if (scm_is_false (mod))
mod = scm_the_root_module ();
var = scm_module_lookup (mod, sym); var = scm_module_lookup (mod, sym);
if (ip[4] & 0x1) if (ip[4] & 0x1)
VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (fp[-1], sym)); VM_ASSERT (VARIABLE_BOUNDP (var), vm_error_unbound (fp[-1], sym));
@ -2267,7 +2272,18 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
modname = SCM_PACK ((scm_t_bits) modname_words); modname = SCM_PACK ((scm_t_bits) modname_words);
sym = *((SCM *) sym_loc); sym = *((SCM *) sym_loc);
if (scm_is_true (SCM_CAR (modname))) if (!scm_module_system_booted_p)
{
#ifdef VM_ENABLE_PARANOID_ASSERTIONS
ASSERT
(scm_is_true
scm_equal_p (modname,
scm_list_2 (SCM_BOOL_T,
scm_from_utf8_symbol ("guile"))));
#endif
var = scm_lookup (sym);
}
else if (scm_is_true (SCM_CAR (modname)))
var = scm_public_lookup (SCM_CDR (modname), sym); var = scm_public_lookup (SCM_CDR (modname), sym);
else else
var = scm_private_lookup (SCM_CDR (modname), sym); var = scm_private_lookup (SCM_CDR (modname), sym);