X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/418752c55a29e2380d6d1aef767b7cfba02cf4be..b0ff693c25bf81f935efa15a44fdad6ce95e9f91:/src/codegen-impl.lisp?ds=sidebyside

diff --git a/src/codegen-impl.lisp b/src/codegen-impl.lisp
index 3790d9d..acb0da1 100644
--- a/src/codegen-impl.lisp
+++ b/src/codegen-impl.lisp
@@ -125,9 +125,17 @@ (defmethod emit-inst ((codegen basic-codegen) inst)
 (defmethod emit-insts ((codegen basic-codegen) insts)
   (asetf (codegen-insts codegen) (revappend insts it)))
 
+(defmethod emit-decl ((codegen basic-codegen) inst)
+  (push inst (codegen-vars codegen)))
+
+(defmethod emit-decls ((codegen basic-codegen) insts)
+  (asetf (codegen-vars codegen) (revappend insts it)))
+
 (defmethod ensure-var ((codegen basic-codegen) name type &optional init)
   (let* ((vars (codegen-vars codegen))
-	 (var (find name vars :key #'inst-name :test #'equal)))
+	 (var (find name
+		    (remove-if-not (lambda (var) (typep var 'var-inst)) vars)
+		    :key #'inst-name :test #'equal)))
     (cond ((not var)
 	   (setf (codegen-vars codegen)
 		 (cons (make-var-inst name type init) vars)))
@@ -176,7 +184,7 @@ (defmethod temporary-var ((codegen basic-codegen) type)
 			   (c-type-equal-p type (inst-type var)))
 		      name
 		      nil)))
-	      vars)
+	      (remove-if-not (lambda (var) (typep var 'var-inst)) vars))
 	(let* ((name (make-instance 'temporary-variable
 				    :in-use-p t
 				    :tag (prog1 temp-index