Changeset 15034

Timestamp:

06/03/17 04:35:20 (6 years ago)

Author:

Mark Evenson

Message:

Fix NTH inlining type mismatch
(Olof-Joachim Frahm)

Fixes <​http://abcl.org/trac/ticket/316>.

From <​https://github.com/Ferada/abcl/commit/4b6cbb1a917fbd33d949da131b57c93641fafbd6>.

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/compiler-pass2.lisp (modified) (2 diffs)
• test/lisp/abcl/misc-tests.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -5532 +5532 @@
 (define-inlined-function compile-nth (form target representation)
   ((check-arg-count form 2))
-  (let ((index-form (second form))
-        (list-form (third form)))
+  (let* ((index-form (second form))
+         (list-form (third form))
+         (index-type (derive-compiler-type index-form)))
+    (unless (fixnum-type-p index-type)
+      (compile-function-call form target representation)
+      (return-from compile-nth))
     (with-operand-accumulation
         ((compile-operand index-form :int)
@@ -5539 +5543 @@
          (maybe-emit-clear-values index-form list-form))
       (emit 'swap)
-      (emit-invokevirtual +lisp-object+ "NTH" '(:int) +lisp-object+))
-    (fix-boxing representation nil) ; FIXME use derived result type
-    (emit-move-from-stack target representation)))
+      (emit-invokevirtual +lisp-object+ "NTH" '(:int) +lisp-object+))))
 
 (defun p2-times (form target representation)

trunk/abcl/test/lisp/abcl/misc-tests.lisp

@@ -131 +131 @@
   (destructuring-bind (a . b) '(1) (list a b))
   (1 NIL))
+
+;; this used to fail during byte code verification
+(deftest nth.inlined.1
+    (prog1 T (compile NIL (lambda (list) (nth (lambda ()) list))))
+  T)