X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fdynamic-extent.impure.lisp;h=78923f3717f33f669d983a2e6c291ca6769fac2f;hb=975f1932acc3a8e90fb31d2b055bfbdde78ea927;hp=ba18278d9088b26a3b61386ba317ecce528cc566;hpb=970dd272dc84f7420252eadb4829cc193f795716;p=sbcl.git

diff --git a/tests/dynamic-extent.impure.lisp b/tests/dynamic-extent.impure.lisp
index ba18278..78923f3 100644
--- a/tests/dynamic-extent.impure.lisp
+++ b/tests/dynamic-extent.impure.lisp
@@ -126,6 +126,65 @@
 
 (assert (eq t (dxclosure 13)))
 
+;;; value-cells
+
+(defun-with-dx dx-value-cell (x)
+  ;; Not implemented everywhere, yet.
+  #+(or x86 x86-64 mips)
+  (let ((cell x))
+    (declare (dynamic-extent cell))
+    (flet ((f ()
+             (incf cell)))
+      (declare (dynamic-extent #'f))
+      (true #'f))))
+
+;;; CONS
+
+(defun-with-dx cons-on-stack (x)
+  (let ((cons (cons x x)))
+    (declare (dynamic-extent cons))
+    (true cons)
+    nil))
+
+;;; Nested DX
+
+(defun-with-dx nested-dx-lists ()
+  (let ((dx (list (list 1 2) (list 3 4))))
+    (declare (dynamic-extent dx))
+    (true dx)
+    nil))
+
+(defun-with-dx nested-dx-conses ()
+  (let ((dx (cons 1 (cons 2 (cons 3 (cons (cons t t) nil))))))
+    (declare (dynamic-extent dx))
+    (true dx)
+    nil))
+
+;;; multiple uses for dx lvar
+
+(defun-with-dx multiple-dx-uses ()
+  (let ((dx (if (true t)
+                (list 1 2 3)
+                (list 2 3 4))))
+    (declare (dynamic-extent dx))
+    (true dx)
+    nil))
+
+;;; with-spinlock should use DX and not cons
+
+(defvar *slock* (sb-thread::make-spinlock :name "slocklock"))
+
+(defun test-spinlock ()
+  (sb-thread::with-spinlock (*slock*)
+    (true *slock*)))
+
+;;; not really DX, but GETHASH and (SETF GETHASH) should not cons
+
+(defvar *table* (make-hash-table))
+
+(defun test-hash-table ()
+  (setf (gethash 5 *table*) 13)
+  (gethash 5 *table*))
 
 (defmacro assert-no-consing (form &optional times)
   `(%assert-no-consing (lambda () ,form) ,times))
@@ -147,7 +206,16 @@
   (assert-no-consing (test-nip-values))
   (assert-no-consing (test-let-var-subst1 17))
   (assert-no-consing (test-let-var-subst2 17))
-  (assert-no-consing (test-lvar-subst 11)))
+  (assert-no-consing (test-lvar-subst 11))
+  (assert-no-consing (dx-value-cell 13))
+  (assert-no-consing (cons-on-stack 42))
+  (assert-no-consing (nested-dx-conses))
+  (assert-no-consing (nested-dx-lists))
+  (assert-no-consing (multiple-dx-uses))
+  ;; Not strictly DX..
+  (assert-no-consing (test-hash-table))
+  #+sb-thread
+  (assert-no-consing (test-spinlock)))
 
 
 ;;; Bugs found by Paul F. Dietz