Update of /cvsroot/sbcl/sbcl/src/compiler
In directory vz-cvs-3.sog:/tmp/cvs-serv23886/src/compiler
Modified Files:
ir1-translators.lisp
Log Message:
1.0.47.26: BEST-SUB-SOURCE-PATH should ignore quoted constants
Not only can they be improper, they can also be cyclic.
Fixes lp#767959.
Index: ir1-translators.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ir1-translators.lisp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ir1-translators.lisp 8 Apr 2011 13:11:56 -0000 1.98
+++ ir1-translators.lisp 21 Apr 2011 11:06:15 -0000 1.99
@@ -75,9 +75,14 @@
nil
(labels ((sub (form)
(or (get-source-path form)
- (and (consp form)
- (some #'sub form)))))
- (or (sub form)))))
+ (when (consp form)
+ (unless (eq 'quote (car form))
+ (somesub form)))))
+ (somesub (forms)
+ (when (consp forms)
+ (or (sub (car forms))
+ (somesub (cdr forms))))))
+ (sub form))))
;;;; BLOCK and TAGBODY
|