Index: /branches/mb-coverage-merge/compiler/X86/x862.lisp =================================================================== --- /branches/mb-coverage-merge/compiler/X86/x862.lisp (revision 8520) +++ /branches/mb-coverage-merge/compiler/X86/x862.lisp (revision 8521) @@ -613,5 +613,5 @@ (when (and *compiler-record-source* *definition-source-note*) (list 'function-source-note - (source-note-for-%lfun-info *definition-source-note* :form nil :children nil))) + (source-note-for-%lfun-info *definition-source-note* :form nil :subform-notes nil))) (when *x862-recorded-symbols* (list 'function-symbol-map (x862-digest-symbols))) @@ -687,5 +687,5 @@ (defun x862-generate-pc-source-map (definition-source-note emitted-source-notes) (when *compiler-record-source* - (let ((def-start (source-note-start definition-source-note)) + (let ((def-start (source-note-start-pos definition-source-note)) (vec (make-array (length emitted-source-notes)))) (loop @@ -693,6 +693,6 @@ for pc-start = (x862-vinsn-note-label-address start t) for pc-end = (x862-vinsn-note-label-address (vinsn-note-peer start) nil) - for text-start = (- (source-note-start (aref (vinsn-note-info start) 0)) def-start) - for text-end = (- (source-note-end (aref (vinsn-note-info start) 0)) def-start) + for text-start = (- (source-note-start-pos (aref (vinsn-note-info start) 0)) def-start) + for text-end = (- (source-note-end-pos (aref (vinsn-note-info start) 0)) def-start) for index upfrom 0 for mapping = (cond Index: /branches/mb-coverage-merge/compiler/nx0.lisp =================================================================== --- /branches/mb-coverage-merge/compiler/nx0.lisp (revision 8520) +++ /branches/mb-coverage-merge/compiler/nx0.lisp (revision 8521) @@ -1651,6 +1651,6 @@ (when (and note (not (gethash (source-note-form note) map))) (setf (gethash (source-note-form note) map) note) - (walk (source-note-children note)) - (setf (source-note-children note) '()))) + (walk (source-note-subform-notes note)) + (setf (source-note-subform-notes note) '()))) ((null note) '()) (t (error "Don't know how to deal with a source note like ~S." @@ -1658,21 +1658,4 @@ (walk source-note)) map)) - -(defun compute-children-text (source-note stream source-note-map) - (when source-note - (unless (source-note-%text source-note) - (setf (source-note-%text source-note) - (substream stream (source-note-start source-note) (source-note-end source-note)))) - (dolist (nested (source-note-children source-note)) - (when nested - (unless (source-note-%text nested) - (setf (source-note-%text nested) - (make-array (- (source-note-end nested) (source-note-start nested)) - :displaced-to (source-note-%text source-note) - :displaced-index-offset (- (source-note-start nested) - (source-note-start source-note))))) - (setf (gethash (source-note-form nested) source-note-map) nested) - (compute-children-text nested nil source-note-map)))) - source-note) (defun nx1-source-note (nx1-code) Index: /branches/mb-coverage-merge/level-1/l1-boot-2.lisp =================================================================== --- /branches/mb-coverage-merge/level-1/l1-boot-2.lisp (revision 8520) +++ /branches/mb-coverage-merge/level-1/l1-boot-2.lisp (revision 8521) @@ -267,5 +267,5 @@ (bin-load-provide "DESCRIBE" "describe") (bin-load-provide "SOURCE-FILES" "source-files") - (bin-load-provide "COVER" "cover") +; (bin-load-provide "COVER" "cover") (bin-load-provide "MCL-COMPAT" "mcl-compat") (require "LOOP") Index: /branches/mb-coverage-merge/level-1/l1-reader.lisp =================================================================== --- /branches/mb-coverage-merge/level-1/l1-reader.lisp (revision 8520) +++ /branches/mb-coverage-merge/level-1/l1-reader.lisp (revision 8521) @@ -3011,10 +3011,16 @@ ;;; we don't actually store source-note structs in the fasl since that runs into problems dumping ;;; the struct. -(defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (form t) (children t) (file-name t)) - (append (when start (list :start (source-note-start note))) - (when end (list :end (source-note-end note))) - (when text (list :%text (%fast-compact (source-note-%text note)))) +(defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (form t) (subform-notes t) (file-name t)) + (append (when start (list :start (source-note-start-pos note))) + (when end (list :end (source-note-end-pos note))) + (when text + (let ((source (source-note-source note))) + (%fast-compact + (etypecase source + (string source) + (source-note (source-note-source source)) + (code-note (code-note-source source)))))) (when form (list :form (source-note-form note))) - (when children (list :children (source-note-children note))) + (when subform-notes (list :subform-notes (source-note-subform-notes note))) (when file-name (list :file-name (source-note-file-name note))))) @@ -3024,5 +3030,6 @@ :start-pos (getf note-plist :start) :end-pos (getf note-plist :end) - :text (%fast-uncompact (getf note-plist :%text))))) + :text (%fast-uncompact (getf note-plist :%text)) + ))) Index: /branches/mb-coverage-merge/lib/nfcomp.lisp =================================================================== --- /branches/mb-coverage-merge/lib/nfcomp.lisp (revision 8520) +++ /branches/mb-coverage-merge/lib/nfcomp.lisp (revision 8521) @@ -857,5 +857,6 @@ (compiler-function-overflow))) ,@forms))))) - (record-form-source-equivalent/list lambda forms) + (dolist (form forms) + (record-form-source-equivalent lambda forms)) (setq *fcomp-toplevel-forms* '()) ;(format t "~& Random toplevel form: ~s" lambda)