From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Thu, 18 Jun 2009 14:14:34 +0000 (+0000)
Subject: 1.0.29.18: delete more debugging cruft that should never have been committed
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=baee4b0e353648e6f3e7a5826f462fec95df1738;p=sbcl.git

1.0.29.18: delete more debugging cruft that should never have been committed

...sorry about the noise.
---

diff --git a/src/code/early-source-location.lisp b/src/code/early-source-location.lisp
index d5d00e3..57af0a7 100644
--- a/src/code/early-source-location.lisp
+++ b/src/code/early-source-location.lisp
@@ -24,13 +24,12 @@
 (defvar *source-location-thunks* nil)
 
 ;; Will be redefined in src/code/source-location.lisp.
-(defun source-location (&optional name)
-  (declare (ignore name))
+(defun source-location ()
   nil)
 
 ;; Will be redefined in src/code/source-location.lisp
 #-sb-xc-host
-(define-compiler-macro source-location (&optional name)
+(define-compiler-macro source-location ()
   (when (and (boundp '*source-info*)
              (symbol-value '*source-info*))
     (let ((form `(cons ,(make-file-info-namestring
@@ -38,8 +37,6 @@
                          (sb!c:get-toplevelish-file-info (symbol-value '*source-info*)))
                        ,(when (boundp '*current-path*)
                               (source-path-tlf-number (symbol-value '*current-path*))))))
-      (when (eq 'replace name)
-        (break "early source location: ~S" form))
       form)))
 
 ;; If the whole source location tracking machinery has been loaded
diff --git a/src/code/source-location.lisp b/src/code/source-location.lisp
index 0d39ac3..3d488d2 100644
--- a/src/code/source-location.lisp
+++ b/src/code/source-location.lisp
@@ -52,19 +52,15 @@
             nil))))
 
 #!+sb-source-locations
-(define-compiler-macro source-location (&optional name &environment env)
+(define-compiler-macro source-location (&environment env)
   (declare (ignore env))
-  #-sb-xc-host
-  (let ((loc (make-definition-source-location)))
-    (when (eq 'replace name)
-      (break "source location ~S" loc))
-    loc))
+  #-sb-xc-host (make-definition-source-location))
 
 ;; We need a regular definition of SOURCE-LOCATION for calls processed
 ;; during LOAD on a source file while *EVALUATOR-MODE* is :INTERPRET.
 #!+sb-source-locations
 (setf (symbol-function 'source-location)
-      (lambda (&optional name) (declare (ignore name)) (make-definition-source-location)))
+      (lambda () (make-definition-source-location)))
 
 (/show0 "/Processing source location thunks")
 #!+sb-source-locations
diff --git a/version.lisp-expr b/version.lisp-expr
index 28fe2ab..e321dac 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.29.17"
+"1.0.29.18"