Handle logical pathnames in debug info at lower level

rather than explicitly specifying :source or w/e

src/lisp/kernel/cleavir/debuginfo.lisp

@@ -17,11 +17,19 @@
 (defun make-dibuilder (module)
   (llvm-sys:make-dibuilder module))
 
-(defun make-difile (pathname &key (source ";;"))
-  (let ((filename (file-namestring pathname))
-        (directory
-          (namestring
-           (make-pathname :name nil :type nil :defaults pathname))))
+(defun make-difile (pathname)
+  (let* ((physical (translate-logical-pathname pathname))
+         (source (if (core:logical-pathname-p pathname)
+                     (format nil ";; LOGICAL-PATHNAME=~a~%"
+                             (namestring pathname))
+                     ;; LLVM expects that either all locations have
+                     ;; a SOURCE or none of them do, so we always
+                     ;; put in something.
+                     ";;"))
+         (filename (file-namestring physical))
+         (directory
+           (namestring
+            (make-pathname :name nil :type nil :defaults physical))))
     (llvm-sys:dibuilder/create-file *dibuilder* filename directory
                                     nil source)))
 
@@ -30,10 +38,10 @@
 ;;; pretty important.
 (defvar *difile-cache*)
 
-(defun ensure-difile (pathname &key (source ";;"))
+(defun ensure-difile (pathname)
   (or (gethash pathname *difile-cache*)
       (setf (gethash pathname *difile-cache*)
-            (make-difile pathname :source source))))
+            (make-difile pathname))))
 
 (defun add-module-di-flags (module)
   ;; add the flag that defines the Dwarf Version
@@ -61,7 +69,7 @@
 ;;; also bind *dbg-current-scope* to a new DIFile.
 ;;; Afterwords finalize the DIBuilder, and add debug flags to the module.
 (defmacro with-debuginfo ((llvm-ir-module
-                           &key (file nil filep) (source ";;"))
+                           &key (path nil pathp))
                           &body body)
   (let ((gbody (gensym "BODY"))
         (gmodule (gensym "MODULE")))
@@ -72,9 +80,9 @@
                   (*dibuilder* (make-dibuilder ,gmodule))
                   (*difile-cache* (make-hash-table :test #'equal)))
              (unwind-protect
-                  ,(if filep
+                  ,(if pathp
                        `(let ((*dbg-current-scope*
-                                (ensure-difile ,file :source ,source)))
+                                (ensure-difile ,path)))
                           (install-compile-unit *dibuilder*
                                                 *dbg-current-scope*)
                           (,gbody))
@@ -123,7 +131,7 @@
                               &key scope (alignment 64))
   ;; These types are used by the runtime rather than being defined
   ;; anywhere, so the file spec is a little dumb.
-  (let ((file (make-difile "-implicit-")) (lineno 0))
+  (let ((file (make-difile #p"-implicit-")) (lineno 0))
     (llvm-sys:create-struct-type
      dibuilder scope name file lineno
      ;; WARNING: This may not work in general,

src/lisp/kernel/cleavir/translate.lisp

@@ -1871,14 +1871,13 @@ COMPILE-FILE will use the default *clasp-env*."
         (pathname
           (let ((origin (origin-source (bir:origin bir))))
             (if origin
-                (namestring
-                 (core:file-scope-pathname
-                  (core:file-scope
-                   (core:source-pos-info-file-handle origin))))
-                "repl-code"))))
+                (core:file-scope-pathname
+                 (core:file-scope
+                  (core:source-pos-info-file-handle origin)))
+                #p"repl-code"))))
     (cmp::with-module (:module module)
       (multiple-value-bind (ordered-raw-constants-list constants-table startup-shutdown-id)
-          (with-debuginfo (module :file pathname)
+          (with-debuginfo (module :path pathname)
             (multiple-value-prog1
                 (literal:with-rtv
                     (translate bir :linkage linkage :abi abi))
@@ -1952,7 +1951,7 @@ COMPILE-FILE will use the default *clasp-env*."
         (eclector.reader:*client* cmp:*cst-client*)
         (cst-to-ast:*compiler* 'cl:compile-file))
     (with-debuginfo (cmp:*the-module*
-                     :file (namestring cmp::*compile-file-source-debug-pathname*))
+                     :path cmp::*compile-file-source-debug-pathname*)
       (loop
         ;; Required to update the source pos info. FIXME!?
         (peek-char t source-sin nil)

src/lisp/kernel/cmp/compile-file-parallel.lisp

@@ -153,7 +153,7 @@
         (core:*current-source-pos-info* (ast-job-source-pos-info job)))
     (with-module (:module module)
       (with-make-new-run-all (run-all-function (format nil "module~a" (ast-job-form-index job)))
-        (clasp-cleavir::with-debuginfo (module :file (namestring cmp::*compile-file-source-debug-pathname*))
+        (clasp-cleavir::with-debuginfo (module :path cmp::*compile-file-source-debug-pathname*)
           (with-literal-table (:id (ast-job-form-index job))
             (core:with-memory-ramp (:pattern 'gctools:ramp)
               (literal:arrange-thunk-as-top-level