[Sbcl-commits] CVS: sbcl/src/code early-source-location.lisp, 1.1, 1.2 source-location.lisp, 1.1, 1.2

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18193/src/code

Modified Files:
	early-source-location.lisp source-location.lisp 
Log Message:
1.0.16.18: Fixes to get clisp through host-1
	Just a couple of ignores and code rearrangements.


Index: early-source-location.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/early-source-location.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- early-source-location.lisp	6 Nov 2005 08:40:31 -0000	1.1
+++ early-source-location.lisp	6 May 2008 10:45:43 -0000	1.2
@@ -12,6 +12,15 @@
 
 (in-package "SB!C")
 
+;;; Used as the CDR of the code coverage instrumentation records
+;;; (instead of NIL) to ensure that any well-behaving user code will
+;;; not have constants EQUAL to that record. This avoids problems with
+;;; the records getting coalesced with non-record conses, which then
+;;; get mutated when the instrumentation runs. Note that it's
+;;; important for multiple records for the same location to be
+;;; coalesced. -- JES, 2008-01-02
+(defconstant +code-coverage-unmarked+ '%code-coverage-unmarked%)
+
 (defvar *source-location-thunks* nil)
 
 ;; Should get called only in unusual circumstances. Normally handled

Index: source-location.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/source-location.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- source-location.lisp	6 Nov 2005 08:40:31 -0000	1.1
+++ source-location.lisp	6 May 2008 10:45:43 -0000	1.2
@@ -30,6 +30,7 @@
   (plist *source-plist*))
 
 (defun make-file-info-namestring (name file-info)
+  #+sb-xc-host (declare (ignore name))
   (let* ((untruename (file-info-untruename file-info))
          (dir (and untruename (pathname-directory untruename))))
     #+sb-xc-host
@@ -49,6 +50,7 @@
 
 #!+sb-source-locations
 (define-compiler-macro source-location (&environment env)
+  #+sb-xc-host (declare (ignore env))
   #-sb-xc-host
   (unless (policy env (and (> space 1)
                            (> space debug)))