;; Namestring of the source file that the definition was compiled from.
;; This is null if the definition was not compiled from a file.
(namestring
- (when (and (boundp '*source-info*)
- *source-info*)
- (make-file-info-namestring *compile-file-pathname*
- (sb!c:get-toplevelish-file-info *source-info*)))
+ (or *source-namestring*
+ (when (and (boundp '*source-info*)
+ *source-info*)
+ (make-file-info-namestring *compile-file-pathname*
+ (sb!c:get-toplevelish-file-info *source-info*))))
:type (or string null))
;; Toplevel form index
(toplevel-form-number
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