1.0.18.20: Fewer STYLE-WARNINGs.

[sbcl.git] / src / code / source-location.lisp

diff --git a/src/code/source-location.lisp b/src/code/source-location.lisp
index 9cb1a9a..be5d1fd 100644 (file)
--- a/src/code/source-location.lisp
+++ b/src/code/source-location.lisp
@@ -19,7 +19,7 @@
    (when (and (boundp '*source-info*)
               *source-info*)
      (make-file-info-namestring *compile-file-pathname*
-                                (source-info-file-info *source-info*)))
+                                (sb!c:get-toplevelish-file-info *source-info*)))
    :type (or string null))
   ;; Toplevel form index
   (toplevel-form-number
@@ -53,6 +53,12 @@
   (declare (ignore env))
   #-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 () (make-definition-source-location)))
+
 (/show0 "/Processing source location thunks")
 #!+sb-source-locations
 (dolist (fun *source-location-thunks*)