\f
;;;; Check that we get debug arglists right.
+(defvar *p* (namestring *load-truename*))
+
;;; FIXME: This should use some get-argslist like functionality that
;;; we actually export.
;;;
(defvar *undefined-function-frame*
;; bug 353
- '(#+(or x86 x86-64) "bogus stack frame"
- #-(or x86 x86-64) "undefined function"))
+ '("undefined function"))
;;; Test for "undefined function" (undefined_tramp) working properly.
;;; Try it with and without tail call elimination, since they can have
(funcall fun)))
(with-test (:name (:undefined-function :bug-346)
- :fails-on '(or :alpha :ppc :sparc :mips
+ ;; Failures on ALPHA, SPARC, MIPS, and probably
+ ;; HPPA are due to not having a full and valid
+ ;; stack frame for the undefined function frame.
+ ;; See PPC undefined_tramp for details.
+ :fails-on '(or :alpha :sparc :mips
(and :x86-64 :freebsd)))
(assert (verify-backtrace
(lambda () (test #'optimized))
(list *undefined-function-frame*
- (list '(flet test) #'optimized)))))
+ (list `(flet test :in ,*p*) #'optimized)))))
;; bug 353: This test fails at least most of the time for x86/linux
;; ca. 0.8.20.16. -- WHN
- (with-test (:name (:undefined-function :bug-353)
- ;; This used to have fewer :fails-on features pre-0.9.16.38,
- ;; but it turns out that the bug was just being masked by
- ;; the presence of the IR1 stepper instrumentation (and
- ;; is thus again failing now that the instrumentation is
- ;; no more).
- :fails-on '(or :alpha :mips :ppc))
+ (with-test (:name (:undefined-function :bug-353))
(assert (verify-backtrace
(lambda () (test #'not-optimized))
(list *undefined-function-frame*
- (list '(flet not-optimized))
- (list '(flet test) #'not-optimized))))))
+ (list `(flet not-optimized :in ,*p*))
+ (list `(flet test :in ,*p*) #'not-optimized))))))
(with-test (:name :backtrace-interrupted-condition-wait
:skipped-on '(not :sb-thread)
;; :TIMEOUT NIL to the frame we expect. If we leave it out,
;; the backtrace is fine -- but the test fails. I can only
;; boggle right now.
- :fails-on :darwin)
+ :fails-on '(or (and :x86 :linux) :darwin))
(let ((m (sb-thread:make-mutex))
(q (sb-thread:make-waitqueue)))
(assert (verify-backtrace
:fails-on :alpha) ; bug 346
(assert (verify-backtrace (lambda () (test #'optimized))
(list '(/ 42 &rest)
- (list '(flet test) #'optimized)))))
+ (list `(flet test :in ,*p*) #'optimized)))))
(with-test (:name (:divide-by-zero :bug-356)
:fails-on :alpha) ; bug 356
(assert (verify-backtrace (lambda () (test #'not-optimized))
(list '(/ 42 &rest)
- '((flet not-optimized))
- (list '(flet test) #'not-optimized))))))
+ `((flet not-optimized :in ,*p*))
+ (list `(flet test :in ,*p*) #'not-optimized))))))
(with-test (:name (:throw :no-such-tag)
:fails-on '(or
(throw 'no-such-tag t))
(assert (verify-backtrace #'throw-test '((throw-test))))))
+(defun bug-308926 (x)
+ (let ((v "foo"))
+ (flet ((bar (z)
+ (oops v z)
+ (oops z v)))
+ (bar x)
+ (bar v))))
+
+(with-test (:name :bug-308926)
+ (assert (verify-backtrace (lambda () (bug-308926 13))
+ '(((flet bar :in bug-308926) 13)
+ (bug-308926 &rest t)))))
+
;;; test entry point handling in backtraces
(defun oops ()
(defvar *compile-nil-non-tc* (compile nil '(lambda (y) (cons (funcall *compile-nil-error* y) nil))))
(with-test (:name (:compile nil))
(assert (verify-backtrace (lambda () (funcall *compile-nil-non-tc* 13))
- '(((lambda (x)) 13)
- ((lambda (y)) 13)))))
+ `(((lambda (x) :in ,*p*) 13)
+ ((lambda (y) :in ,*p*) 13)))))
(with-test (:name :clos-slot-typecheckfun-named)
(assert
(assert
(verify-backtrace (lambda ()
(funcall (make-fun 0) 10 11 0))
- '((sb-kernel:two-arg-/ 10/11 0)
+ `((sb-kernel:two-arg-/ 10/11 0)
(/ 10 11 0)
- ((lambda (&rest rest)) 10 11 0))))
+ ((lambda (&rest rest) :in ,*p*) 10 11 0))))
(assert
(verify-backtrace (lambda ()
(funcall (make-fun 1) 10 11 0))
- '((sb-kernel:two-arg-/ 10/11 0)
+ `((sb-kernel:two-arg-/ 10/11 0)
(/ 10 11 0)
- ((lambda (a &rest rest)) 10 11 0))))
+ ((lambda (a &rest rest) :in ,*p*) 10 11 0))))
(assert
(verify-backtrace (lambda ()
(funcall (make-fun 2) 10 11 0))
- '((sb-kernel:two-arg-/ 10/11 0)
+ `((sb-kernel:two-arg-/ 10/11 0)
(/ 10 11 0)
- ((lambda (a b &rest rest)) 10 11 0))))))
+ ((lambda (a b &rest rest) :in ,*p*) 10 11 0))))))
;;;; test TRACE
(declare (notinline dx-arg-backtrace))
(assert (member-if (lambda (frame)
(and (consp frame)
- (equal '(flet dx-arg-backtrace) (car frame))
+ (consp (car frame))
+ (equal '(flet dx-arg-backtrace :in) (butlast (car frame)))
(notany #'sb-debug::stack-allocated-p (cdr frame))))
(dx-arg-backtrace dx-arg))))))