diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-04-20 14:28:07 -0300 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-04-20 14:28:07 -0300 |
| commit | 332e62ab1f5d90d22951b67c430cbd4da9c10dbe (patch) | |
| tree | a0951c314ffe9b587ba2789d8323d7a92c64c674 /lisp/emacs-lisp | |
| parent | bfab7d852d64bcfe68073e03e787eb2200391d9d (diff) | |
| download | emacs-332e62ab1f5d90d22951b67c430cbd4da9c10dbe.tar.gz emacs-332e62ab1f5d90d22951b67c430cbd4da9c10dbe.tar.bz2 emacs-332e62ab1f5d90d22951b67c430cbd4da9c10dbe.zip | |
* lisp/emacs-lisp/byte-opt.el (byte-decompile-bytecode-1): Remove dead code,
add sanity check.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 548fcd133df..7b98ade2422 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1364,8 +1364,7 @@ (defun byte-decompile-bytecode-1 (bytes constvec &optional make-spliceable) (let ((length (length bytes)) (bytedecomp-ptr 0) optr tags bytedecomp-op offset - lap tmp - endtag) + lap tmp) (while (not (= bytedecomp-ptr length)) (or make-spliceable (push bytedecomp-ptr lap)) @@ -1373,7 +1372,9 @@ optr bytedecomp-ptr ;; This uses dynamic-scope magic. offset (disassemble-offset bytes)) - (setq bytedecomp-op (aref byte-code-vector bytedecomp-op)) + (let ((opcode (aref byte-code-vector bytedecomp-op))) + (assert opcode) + (setq bytedecomp-op opcode)) (cond ((memq bytedecomp-op byte-goto-ops) ;; It's a pc. (setq offset @@ -1417,8 +1418,6 @@ (setq rest (cdr rest)))) (setq rest (cdr rest)))) (if tags (error "optimizer error: missed tags %s" tags)) - (if endtag - (setq lap (cons (cons nil endtag) lap))) ;; Remove addrs, lap = ( [ (op . arg) | (TAG tagno) ]* ) (mapcar (function (lambda (elt) (if (numberp elt) |