wingo pushed a commit to branch master
in repository guile.
commit e00c0a48240190b655cc482e6bc395a5de206040
Author: Andy Wingo <[email protected]>
Date: Fri Jan 23 16:07:00 2015 +0100
Fix the assembler for unexpected source properties
* module/system/vm/assembler.scm (link-debug): Fix for source properties
that don't have line and column, as are currently being produced by
the new lalr.
---
module/system/vm/assembler.scm | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm
index 19f8120..6bc2bcf 100644
--- a/module/system/vm/assembler.scm
+++ b/module/system/vm/assembler.scm
@@ -2144,11 +2144,13 @@ procedure with label @var{rw-init}. @var{rw-init} may
be false. If
(lp sources
;; Guile line and column numbers are 0-indexed, but
;; they are 1-indexed for DWARF.
- (cons (list pc
- (if (string? file) (intern-file file) 0)
- (if line (1+ line))
- (if col (1+ col)))
- out))))
+ (if (and line col)
+ (cons (list pc
+ (if (string? file) (intern-file file) 0)
+ (1+ line)
+ (1+ col))
+ out)
+ out))))
(()
;; Compilation unit header for .debug_line. We write in
;; DWARF 2 format because more tools understand it than DWARF
