summaryrefslogtreecommitdiff
path: root/module/system/vm/assembler.scm
diff options
context:
space:
mode:
Diffstat (limited to 'module/system/vm/assembler.scm')
-rw-r--r--module/system/vm/assembler.scm14
1 files changed, 10 insertions, 4 deletions
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm
index be1b79e34..77ffb5aa1 100644
--- a/module/system/vm/assembler.scm
+++ b/module/system/vm/assembler.scm
@@ -2821,10 +2821,16 @@ procedure with label @var{rw-init}. @var{rw-init} may be false. If
(let lp ((sources (asm-sources asm)) (out '()))
(match sources
- (((pc . s) . sources)
- (let ((file (assq-ref s 'filename))
- (line (assq-ref s 'line))
- (col (assq-ref s 'column)))
+ (((pc . location) . sources)
+ (let-values (((file line col)
+ ;; Usually CPS records contain a "source
+ ;; vector" coming from tree-il, but some might
+ ;; contain a source property alist.
+ (match location
+ (#(file line col) (values file line col))
+ (lst (values (assq-ref lst 'filename)
+ (assq-ref lst 'line)
+ (assq-ref lst 'column))))))
(lp sources
;; Guile line and column numbers are 0-indexed, but
;; they are 1-indexed for DWARF.