0.pre7.141:

[sbcl.git] / src / compiler / ir1tran.lisp

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index 241e8a0..6d07722 100644 (file)
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -1062,10 +1062,12 @@
        (if *suppress-values-declaration*
           res
           (let ((types (cdr spec)))
-            (do-the-stuff (if (eql (length types) 1)
-                              (car types)
-                              `(values ,@types))
-                          cont res 'values))))
+            (ir1ize-the-or-values (if (eql (length types) 1)
+                                      (car types)
+                                      `(values ,@types))
+                                  cont
+                                  res
+                                  'values))))
       (dynamic-extent
        (when (policy *lexenv* (> speed inhibit-warnings))
         (compiler-note
@@ -1618,7 +1620,7 @@
 
            (body
             `(when (oddp ,n-count)
-               (%odd-key-arguments-error)))
+               (%odd-key-args-error)))
 
            (body
             `(locally
@@ -1633,7 +1635,7 @@
 
            (unless allowp
              (body `(when (and ,n-losep (not ,n-allowp))
-                      (%unknown-key-argument-error ,n-losep)))))))
+                      (%unknown-key-arg-error ,n-losep)))))))
 
       (let ((ep (ir1-convert-lambda-body
                 `((let ,(temps)