From 3c8b7b5089ae068f3dcdf84d7545562ac33e67be Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Tue, 6 May 2008 10:45:42 +0000 Subject: [PATCH] 1.0.16.18: Fixes to get clisp through host-1 Just a couple of ignores and code rearrangements. --- src/code/early-source-location.lisp | 9 +++++++++ src/code/source-location.lisp | 2 ++ src/compiler/ir1tran.lisp | 9 --------- src/compiler/policy.lisp | 2 +- version.lisp-expr | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/code/early-source-location.lisp b/src/code/early-source-location.lisp index 022af85..e7018e3 100644 --- a/src/code/early-source-location.lisp +++ b/src/code/early-source-location.lisp @@ -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 diff --git a/src/code/source-location.lisp b/src/code/source-location.lisp index b96898b..d281ccf 100644 --- a/src/code/source-location.lisp +++ b/src/code/source-location.lisp @@ -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))) diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp index 903a0a6..328eb2e 100644 --- a/src/compiler/ir1tran.lisp +++ b/src/compiler/ir1tran.lisp @@ -832,15 +832,6 @@ ;;;; code coverage -;;; 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%) - ;;; Check the policy for whether we should generate code coverage ;;; instrumentation. If not, just return the original START ;;; ctran. Otherwise insert code coverage instrumentation after diff --git a/src/compiler/policy.lisp b/src/compiler/policy.lisp index 26bf0ce..2e19378 100644 --- a/src/compiler/policy.lisp +++ b/src/compiler/policy.lisp @@ -37,7 +37,7 @@ This is intended to be used interactively, to facilitate recompiling large bodies of code with eg. a known minimum safety. EXPERIMENTAL INTERFACE: Subject to change." - (declare (policy-quality min)) + (declare (type policy-quality min)) (when quality (aver (policy-quality-name-p quality)) (if (zerop min) diff --git a/version.lisp-expr b/version.lisp-expr index 7257239..f934dbf 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.16.17" +"1.0.16.18" -- 1.7.10.4