[Guile-commits] 01/01: Adapt to changes in upstream lightening

[Andy Wingo]

wingo pushed a commit to branch lightening
in repository guile.

commit 52248cf62236c2c3de78400dd725c84288dda3bb
Author: Andy Wingo <address@hidden>
Date:   Thu Apr 25 23:47:27 2019 +0200

    Adapt to changes in upstream lightening
    
    * libguile/jit.c (emit_entry_trampoline): Adapt to change in callee-save
      predicates.
---
 libguile/jit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libguile/jit.c b/libguile/jit.c
index 2e273bcb..a531792 100644
--- a/libguile/jit.c
+++ b/libguile/jit.c
@@ -1275,11 +1275,11 @@ emit_entry_trampoline (scm_jit_state *j)
 
   /* Save values of callee-save registers.  */
   for (size_t i = 0; i < gpr_count; i++)
-    if (jit_gpr_is_callee_save (j->jit, gprs[i]))
+    if (jit_gpr_is_callee_save (gprs[i]))
       jit_pushr (j->jit, gprs[i]);
 
   for (size_t i = 0; i < fpr_count; i++)
-    if (jit_fpr_is_callee_save (j->jit, fprs[i]))
+    if (jit_fpr_is_callee_save (fprs[i]))
       jit_pushr_d (j->jit, fprs[i]);
 
   /* Load our reserved registers: THREAD and SP.  Also load IP for the
@@ -1299,11 +1299,11 @@ emit_entry_trampoline (scm_jit_state *j)
 
   /* Restore callee-save registers.  */
   for (size_t i = 0; i < fpr_count; i++)
-    if (jit_fpr_is_callee_save (j->jit, fprs[fpr_count - i - 1]))
+    if (jit_fpr_is_callee_save (fprs[fpr_count - i - 1]))
       jit_popr_d (j->jit, fprs[fpr_count - i - 1]);
 
   for (size_t i = 0; i < gpr_count; i++)
-    if (jit_gpr_is_callee_save (j->jit, gprs[gpr_count - i - 1]))
+    if (jit_gpr_is_callee_save (gprs[gpr_count - i - 1]))
       jit_popr (j->jit, gprs[gpr_count - i - 1]);
 
   /* When mcode finishes, interpreter will continue with vp->ip.  */