Ignore:
Timestamp:
Dec 17, 2010, 8:20:39 PM (9 years ago)
Author:
gz
Message:

Merge code coverage fixes (r14476, r14477) into 1.6

Location:
release/1.6/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/1.6/source

  • release/1.6/source/compiler/nx-basic.lisp

    r14381 r14493  
    730730(defmacro dbg-assert (form)
    731731  #-debug-code-notes (declare (ignore form))
    732   #+debug-code-notes `(assert ,form))
     732  #+debug-code-notes `(unless ,form (cerror "Ignore assertion failure"
     733                                            "Assertion failure: ~s" ',form)))
    733734
    734735(defvar *acode-right-margin* 120)
     
    757758               ;; note and not a code note, so need to check for code note explicitly.
    758759               (when (code-note-p note)
    759                  (dbg-assert (null (gethash form form->note)))
     760                 (dbg-assert (eq note (gethash form form->note note)))
    760761                 (dbg-assert (null (code-note-acode-range note)))
    761762                 (setf (gethash form form->note) note)))
     
    838839
    839840(defun decomp-form (acode)
    840   (cond ((eq acode *nx-t*) t)
    841         ((eq acode *nx-nil*) nil)
     841  (cond ((nx-t acode) t)
     842        ((nx-null acode) nil)
    842843        (t (let* ((op (car acode))
    843844                  (num (length *next-nx-operators*))
Note: See TracChangeset for help on using the changeset viewer.