[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/01: VM syncs IP in pop-fluid
From: |
Andy Wingo |
Subject: |
[Guile-commits] 01/01: VM syncs IP in pop-fluid |
Date: |
Wed, 9 May 2018 05:08:26 -0400 (EDT) |
wingo pushed a commit to branch stable-2.2
in repository guile.
commit 9a72e212622fa3bd118d7c02c4386601285b3224
Author: Andy Wingo <address@hidden>
Date: Wed May 9 11:07:35 2018 +0200
VM syncs IP in pop-fluid
* libguile/vm-engine.c (pop-fluid): Sync IP before popping, as setting a
fluid may allocate.
---
libguile/vm-engine.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 9509cd6..1aa4e96 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -1,5 +1,5 @@
/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013,
- * 2014, 2015 Free Software Foundation, Inc.
+ * 2014, 2015, 2018 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
@@ -2166,7 +2166,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
*/
VM_DEFINE_OP (73, pop_fluid, "pop-fluid", OP1 (X32))
{
- /* This function must not allocate. */
+ SYNC_IP ();
scm_dynstack_unwind_fluid (&thread->dynstack,
thread->dynamic_state);
NEXT (1);