scratch/comp-branch-optim ae65a6c48fa 4/4: Fix comp--type-branch-optim-block it using comp-cstr-type-p

[Andrea Corallo]

branch: scratch/comp-branch-optim
commit ae65a6c48fac29b89aab53902314edee164662b8
Author: Andrea Corallo <acorallo@gnu.org>
Commit: Andrea Corallo <acorallo@gnu.org>

    Fix comp--type-branch-optim-block it using comp-cstr-type-p
---
 lisp/emacs-lisp/comp.el | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index fba9c8d16f3..a5090deb8f9 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2833,10 +2833,7 @@ Return t if something was changed."
                 (call memq ,(and (pred comp-mvar-p) mvar-1) ,(and (pred 
comp-mvar-p) mvar-2)))
            (cond-jump ,(and (pred comp-mvar-p) mvar-3) ,(pred comp-mvar-p) 
,_bb1 ,bb2))
          (cl-assert (comp-cstr-imm-vld-p mvar-tag))
-         (when (and (length= (comp-mvar-typeset mvar-tested) 1)
-                    (member
-                     (car (comp-mvar-typeset mvar-tested))
-                     (symbol-value (comp-cstr-imm mvar-tag))))
+         (when (comp-cstr-type-p mvar-tested (comp-cstr-cl-tag mvar-tag))
            (comp-log (format "Optimizing conditional branch in function: %s"
                              (comp-func-name comp-func))
                      3)