Changeset 12537

Timestamp:

03/14/10 19:40:13 (11 years ago)

Author:

ehuelsmann

Message:

Backport PROGV fix (r12526) and its CHANGES description.

Location:

branches/0.19.x/abcl

Files:

• CHANGES (modified) (3 diffs)
• src/org/armedbear/lisp/compiler-pass1.lisp (modified) (1 diff)

branches/0.19.x/abcl/CHANGES

@@ -2 +2 @@
 ============
 svn://common-lisp.net/project/armedbear/svn/trunk/abcl
-(Unreleased)
+(14 Mar, 2010)
 
 Features
@@ -38 +38 @@
   SYS:PATHNAME-JAR-P predicate signals whether a pathname references a
   jar.
-       
+
   NB: jar pathnames do *not* currently work as an argument to OPEN.
 
-  SYS:UNZIP implemented to unpack ZIP files.  
+  SYS:UNZIP implemented to unpack ZIP files.
 
   SYS:ZIP now has a three argument version for creating zip files with
@@ -58 +58 @@
 Fixes/Optimizations
 -------------------
+
+* [svn r12526] Unbinding of PROGV bound variables on local transfer
+  of control (within-java-function jump targets)
 
 * [svn r12510] The new ansi-test WITH-STANDARD-IO-SYNTAX.23 passes.

branches/0.19.x/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -1079 +1079 @@
 ;;        (let ((variable (make-variable :name name :special-p t)))
 ;;          (push 
-    (setf (progv-form block)
-          `(progv ,symbols-form ,values-form ,@(p1-body body))
-          (progv-environment-register block) t)
+    (setf (progv-environment-register block) t
+          (progv-form block)
+          `(progv ,symbols-form ,values-form ,@(p1-body body)))
     block))