[armedbear-cvs] r13449 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sun Aug  7 07:20:58 2011
New Revision: 13449

Log:
Dead code removal.

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

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Sun Aug  7 07:14:33 2011	(r13448)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Sun Aug  7 07:20:58 2011	(r13449)
@@ -3115,26 +3115,13 @@
    (astore register)
   )
 
-(defun restore-environment-and-make-handler (register label-START)
-  (let ((label-END (gensym "U"))
-        (label-EXIT (gensym "E")))
-    (emit 'goto label-EXIT)
-    (label label-END)
-    (restore-dynamic-environment register)
-    (emit 'athrow)
-    ;; Restore dynamic environment.
-    (label label-EXIT)
-    (restore-dynamic-environment register)
-    (add-exception-handler label-START label-END label-END nil)))
-
 (defun p2-m-v-b-node (block target)
   (let* ((*register* *register*)
          (form (m-v-b-form block))
          (*visible-variables* *visible-variables*)
          (vars (second form))
          (bind-special-p nil)
-         (variables (m-v-b-vars block))
-         (label-START (gensym "F")))
+         (variables (m-v-b-vars block)))
     (dolist (variable variables)
       (let ((special-p (variable-special-p variable)))
         (cond (special-p
@@ -3148,8 +3135,7 @@
       (dformat t "p2-m-v-b-node lastSpecialBinding~%")
       ;; Save current dynamic environment.
       (setf (m-v-b-environment-register block) (allocate-register nil))
-      (save-dynamic-environment (m-v-b-environment-register block))
-      (label label-START))
+      (save-dynamic-environment (m-v-b-environment-register block)))
     ;; Make sure there are no leftover values from previous calls.
     (emit-clear-values)
     ;; Bind the variables.
@@ -3538,8 +3524,7 @@
          (*register* *register*)
          (form (let-form block))
          (*visible-variables* *visible-variables*)
-         (specialp nil)
-         (label-START (gensym "F")))
+         (specialp nil))
     ;; Walk the variable list looking for special bindings and unused lexicals.
     (dolist (variable (let-vars block))
       (cond ((variable-special-p variable)
@@ -3550,8 +3535,7 @@
     (when specialp
       ;; We need to save current dynamic environment.
       (setf (let-environment-register block) (allocate-register nil))
-      (save-dynamic-environment (let-environment-register block))
-      (label label-START))
+      (save-dynamic-environment (let-environment-register block)))
     (propagate-vars block)
     (ecase (car form)
       (LET
@@ -3952,8 +3936,7 @@
          (values-form (caddr form))
          (*register* *register*)
          (environment-register
-          (setf (progv-environment-register block) (allocate-register nil)))
-         (label-START (gensym "F")))
+          (setf (progv-environment-register block) (allocate-register nil))))
     (with-operand-accumulation
         ((compile-operand symbols-form nil)
 	 (compile-operand values-form nil))
@@ -3961,7 +3944,6 @@
 		   (single-valued-p values-form))
 	(emit-clear-values))
       (save-dynamic-environment environment-register)
-      (label label-START)
       ;; Compile call to Lisp.progvBindVars().
       (emit-push-current-thread)
       (emit-invokestatic +lisp+ "progvBindVars"
@@ -7138,8 +7120,7 @@
          (*visible-variables* *visible-variables*)
 
          (*thread* nil)
-         (*initialize-thread-var* nil)
-         (label-START (gensym "F")))
+         (*initialize-thread-var* nil))
 
     (class-add-method class-file method)
 
@@ -7282,7 +7263,6 @@
         (setf (compiland-environment-register compiland)
               (allocate-register nil))
         (save-dynamic-environment (compiland-environment-register compiland))
-        (label label-START)
         (dolist (variable (compiland-arg-vars compiland))
           (when (variable-special-p variable)
             (setf (variable-binding-register variable) (allocate-register nil))