Changeset 12620 for trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Timestamp:

04/16/10 13:41:21 (14 years ago)

Author:

Mark Evenson

Message:

Use interpreted form in a FASL if compliation fails.

INTERNAL-COMPILER-ERROR now signals that the form being compiled
should be written to the init FASL to be interpreted rather than being
the object of a SYSTEm:PROXY-PRELOADED-FUNCTION. A further
optimization of this strategy would be to actually not include the
failed compilation unit in the packed FASL.

This patches behavior for stack inconsistencies such as present in
ticket #89.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (1 diff)

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

@@ -1343 +1343 @@
         (unless (= (the fixnum instruction-depth) (the fixnum (+ depth instruction-stack)))
           (format t "~&Stack inconsistency at index ~D: found ~S, expected ~S.~%"
-                   i instruction-depth (+ depth instruction-stack)))
+                   i instruction-depth (+ depth instruction-stack))
+          (internal-compiler-error "Stack inconsistency detected in ~A." 
+                                   (compiland-name *current-compiland*)))
         (return-from walk-code))
       (let ((opcode (instruction-opcode instruction)))