From dc263cbb4750dde8c92f44feaa14f4c4115cb542 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 3 Oct 1989 22:55:38 +0000
Subject: [PATCH] Fix bug which prevented correct recognition of debugging info
 for the root block of a multiple-block compilation.

---
 v7/src/runtime/infutl.scm | 10 ++++++++--
 v8/src/runtime/infutl.scm | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/v7/src/runtime/infutl.scm b/v7/src/runtime/infutl.scm
index 09ff4844e..d8a7ce294 100644
--- a/v7/src/runtime/infutl.scm
+++ b/v7/src/runtime/infutl.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/infutl.scm,v 1.12 1989/08/18 19:08:45 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/infutl.scm,v 1.13 1989/10/03 22:55:38 cph Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -70,7 +70,13 @@ MIT in each case. |#
 (define (read-debugging-info descriptor)
   (cond ((string? descriptor)
 	 (let ((binf (read-binf-file descriptor)))
-	   (and binf (dbg-info? binf) binf)))	((and (pair? descriptor)
+	   (and binf
+		(if (dbg-info? binf)
+		    binf
+		    (and (vector? binf)
+			 (not (zero? (vector-length binf)))
+			 (vector-ref binf 0))))))
+	((and (pair? descriptor)
 	      (string? (car descriptor))
 	      (integer? (cdr descriptor))
 	      (not (negative? (cdr descriptor))))
diff --git a/v8/src/runtime/infutl.scm b/v8/src/runtime/infutl.scm
index c9c252171..b8cdb6975 100644
--- a/v8/src/runtime/infutl.scm
+++ b/v8/src/runtime/infutl.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/infutl.scm,v 1.12 1989/08/18 19:08:45 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/infutl.scm,v 1.13 1989/10/03 22:55:38 cph Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -70,7 +70,13 @@ MIT in each case. |#
 (define (read-debugging-info descriptor)
   (cond ((string? descriptor)
 	 (let ((binf (read-binf-file descriptor)))
-	   (and binf (dbg-info? binf) binf)))	((and (pair? descriptor)
+	   (and binf
+		(if (dbg-info? binf)
+		    binf
+		    (and (vector? binf)
+			 (not (zero? (vector-length binf)))
+			 (vector-ref binf 0))))))
+	((and (pair? descriptor)
 	      (string? (car descriptor))
 	      (integer? (cdr descriptor))
 	      (not (negative? (cdr descriptor))))
-- 
2.25.1