let #'c1branch restore types, not #'infer-tp; c2setq swallow exit fix - gcl.git - GNU Common Lisp

diff --git a/gcl/cmpnew/gcl_cmpeval.lsp b/gcl/cmpnew/gcl_cmpeval.lsp
index 7849e3ba2..bb3760997 100755
--- a/gcl/cmpnew/gcl_cmpeval.lsp
+++ b/gcl/cmpnew/gcl_cmpeval.lsp

@@ -510,9 +510,8 @@

(v1 (c1arg n))

(v1 (when (eq (car v1) 'var) (caaddr v1)))

(v1 (unless (eq x v1) v1))

- (res (with-restore-vars

- (do-setq-tp x nil tp)

- (c1expr (if v1 `(infer-tp ,v1 ,tp ,(car args)) (car args)))))

+ (res (progn (do-setq-tp x nil tp)

+ (c1expr (if v1 `(infer-tp ,v1 ,tp ,(car args)) (car args)))))

(ri (cadr res)))

(add-info info ri)

(setf (info-type info) (info-type ri))

diff --git a/gcl/cmpnew/gcl_cmpvar.lsp b/gcl/cmpnew/gcl_cmpvar.lsp
index 0088f13df..7e4c81e48 100755
--- a/gcl/cmpnew/gcl_cmpvar.lsp
+++ b/gcl/cmpnew/gcl_cmpvar.lsp

@@ -1198,7 +1198,7 @@

(case (car form)

(LOCATION (c2location (caddr form)))

(otherwise (unwind-exit vref))))

- ((c2expr* form))))

+ ((c2expr form))))

;; (defun c2setq (vref form &aux (v (car vref)))

;; (cond ((or (eq t (var-ref v)) (consp (var-ref v)) (var-cb v) (eq (var-kind v) 'global));FIXME