[Guile-commits] branch main updated: Fix inlinable-exports serialization for kwargs

[Andy Wingo]

This is an automated email from the git hooks/post-receive script.

wingo pushed a commit to branch main
in repository guile.

The following commit(s) were added to refs/heads/main by this push:
     new 2c645571b Fix inlinable-exports serialization for kwargs
2c645571b is described below

commit 2c645571b351a0044911847025b666551a8e4fb5
Author: Andy Wingo <wi...@pobox.com>
AuthorDate: Mon Mar 18 16:40:32 2024 +0100

    Fix inlinable-exports serialization for kwargs
    
    * module/language/tree-il/inlinable-exports.scm (inlinable-exp): Call
    assq-ref in the right order.  Embarrassing!
    * module/language/tree-il/peval.scm (peval): Print the symbols so that
    we can diagnose later failures.
---
 module/language/tree-il/inlinable-exports.scm | 4 ++--
 module/language/tree-il/peval.scm             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/language/tree-il/inlinable-exports.scm 
b/module/language/tree-il/inlinable-exports.scm
index 76bb7da9f..d1fb74254 100644
--- a/module/language/tree-il/inlinable-exports.scm
+++ b/module/language/tree-il/inlinable-exports.scm
@@ -1,5 +1,5 @@
 ;;; Attaching inlinable definitions of exported bindings to modules
-;;; Copyright (C) 2021, 2022
+;;; Copyright (C) 2021, 2022, 2024
 ;;;   Free Software Foundation, Inc.
 ;;;
 ;;; This library is free software: you can redistribute it and/or modify
@@ -458,7 +458,7 @@
                                       (map
                                        (match-lambda
                                          ((kw name var)
-                                          (list kw name (assq-ref var bound))))
+                                          (list kw name (assq-ref bound var))))
                                        kws))))
                              (map recur* inits)
                              vars*
diff --git a/module/language/tree-il/peval.scm 
b/module/language/tree-il/peval.scm
index f6dc9a38d..f8fca0012 100644
--- a/module/language/tree-il/peval.scm
+++ b/module/language/tree-il/peval.scm
@@ -1759,7 +1759,7 @@ top-level bindings from ENV and return the resulting 
expression."
                 ;; is required by (and checked by) other parts of the
                 ;; compiler, e.g. tree-il-to-cps lowering.
                 (unless (equal? syms (match kw (((k name sym) ...) sym)))
-                  (error "internal error: unexpected kwarg syms"))
+                  (error "internal error: unexpected kwarg syms" kw syms))
 
                 (define (process-kw-args positional? args pbinds)
                   (match args