Changeset 15035

Timestamp:

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

Author:

Mark Evenson

Message:

Fix byte code verification error in edge case
(Olof-Joachim Frahm)

From <​https://github.com/Ferada/abcl/commit/4630bfd27e534bb3e7f0e596cec237c6e5200d6f>.

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

@@ -6847 +6847 @@
 
 (defun p2-throw (form target representation)
-  ;; FIXME What if we're called with a non-NIL representation?
-  (declare (ignore representation))
   (with-operand-accumulation
       ((emit-thread-operand)
@@ -6858 +6856 @@
   ;; Following code will not be reached.
   (when target
-    (emit-push-nil)
+    (ecase representation
+      ((:int :boolean :char)
+       (emit 'iconst_0))
+      ((nil)
+       (emit-push-nil)))
     (emit-move-from-stack target)))
 

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

@@ -136 +136 @@
     (prog1 T (compile NIL (lambda (list) (nth (lambda ()) list))))
   T)
+
+;; these used to fail during byte code verification
+(deftest throw.representation.1
+    (prog1 T (compile NIL (lambda () (eql (the fixnum (throw 'foo 42)) 2))))
+  T)
+
+(deftest throw.representation.2
+    (prog1 T (compile NIL (lambda () (char-code (the character (throw 'foo 42))))))
+  T)
+
+(deftest throw.representation.3
+    (prog1 T (compile NIL (lambda () (if (the boolean (throw 'foo 42)) 1 2))))
+  T)