diff options
| author | Andrea Corallo | 2023-05-29 18:06:33 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2023-05-29 18:07:20 +0200 |
| commit | fbc96dcc4eadd4cce067ba6d177efc69ed459a27 (patch) | |
| tree | e9e9339f0c1f574bcee99fb6849525eab25d6c8c | |
| parent | 56a8d57d032c17263ba70139b85c94436e528572 (diff) | |
| download | emacs-fbc96dcc4eadd4cce067ba6d177efc69ed459a27.tar.gz emacs-fbc96dcc4eadd4cce067ba6d177efc69ed459a27.zip | |
Revert "* Nativecomp disable propagation of pre slot access type check..."
This reverts commit c8e527cbeeea6be9bb713af33a3f40408b261234 as
56a8d57d032 fixes the root cause.
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 937d9fdf926..ec51f805c2b 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el | |||
| @@ -2550,19 +2550,19 @@ TARGET-BB-SYM is the symbol name of the target block." | |||
| 2550 | for insns-seq on (comp-block-insns b) | 2550 | for insns-seq on (comp-block-insns b) |
| 2551 | do | 2551 | do |
| 2552 | (pcase insns-seq | 2552 | (pcase insns-seq |
| 2553 | ;; (`((set ,(and (pred comp-mvar-p) mvar-tested-copy) | 2553 | (`((set ,(and (pred comp-mvar-p) mvar-tested-copy) |
| 2554 | ;; ,(and (pred comp-mvar-p) mvar-tested)) | 2554 | ,(and (pred comp-mvar-p) mvar-tested)) |
| 2555 | ;; (set ,(and (pred comp-mvar-p) mvar-1) | 2555 | (set ,(and (pred comp-mvar-p) mvar-1) |
| 2556 | ;; (call type-of ,(and (pred comp-mvar-p) mvar-tested-copy))) | 2556 | (call type-of ,(and (pred comp-mvar-p) mvar-tested-copy))) |
| 2557 | ;; (set ,(and (pred comp-mvar-p) mvar-2) | 2557 | (set ,(and (pred comp-mvar-p) mvar-2) |
| 2558 | ;; (call symbol-value ,(and (pred comp-cstr-cl-tag-p) mvar-tag))) | 2558 | (call symbol-value ,(and (pred comp-cstr-cl-tag-p) mvar-tag))) |
| 2559 | ;; (set ,(and (pred comp-mvar-p) mvar-3) | 2559 | (set ,(and (pred comp-mvar-p) mvar-3) |
| 2560 | ;; (call memq ,(and (pred comp-mvar-p) mvar-1) ,(and (pred comp-mvar-p) mvar-2))) | 2560 | (call memq ,(and (pred comp-mvar-p) mvar-1) ,(and (pred comp-mvar-p) mvar-2))) |
| 2561 | ;; (cond-jump ,(and (pred comp-mvar-p) mvar-3) ,(pred comp-mvar-p) ,bb1 ,bb2)) | 2561 | (cond-jump ,(and (pred comp-mvar-p) mvar-3) ,(pred comp-mvar-p) ,bb1 ,bb2)) |
| 2562 | ;; (push `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag))) | 2562 | (push `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag))) |
| 2563 | ;; (comp-block-insns (comp-add-cond-cstrs-target-block b bb2))) | 2563 | (comp-block-insns (comp-add-cond-cstrs-target-block b bb2))) |
| 2564 | ;; (push `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag) :neg t)) | 2564 | (push `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag) :neg t)) |
| 2565 | ;; (comp-block-insns (comp-add-cond-cstrs-target-block b bb1)))) | 2565 | (comp-block-insns (comp-add-cond-cstrs-target-block b bb1)))) |
| 2566 | (`((set ,(and (pred comp-mvar-p) cmp-res) | 2566 | (`((set ,(and (pred comp-mvar-p) cmp-res) |
| 2567 | (,(pred comp-call-op-p) | 2567 | (,(pred comp-call-op-p) |
| 2568 | ,(and (or (pred comp-equality-fun-p) | 2568 | ,(and (or (pred comp-equality-fun-p) |