Fix nested promises.

diff --git a/src/runtime/boot.scm b/src/runtime/boot.scm
index ff5a7a5efed43dd3c8b17854826be6a92924211c..33a226a8e8e97300b49692d48d4bed6649118586 100644 (file)
--- a/src/runtime/boot.scm
+++ b/src/runtime/boot.scm
@@ -436,9 +436,7 @@ USA.
        (object-type? (ucode-type delayed) (cell-contents object))))
 
 (define (make-promise object)
-  (if (promise? object)
-      object
-      (make-cell (system-pair-cons (ucode-type delayed) #t object))))
+  (make-cell (system-pair-cons (ucode-type delayed) #t object)))
 
 (define (make-unforced-promise thunk)
   ;(guarantee thunk? thunk 'make-unforced-promise)

diff --git a/tests/runtime/test-promise.scm b/tests/runtime/test-promise.scm
index 0378b01677b19e98e09b36f67dc18ddcdd643772..703baba85ad55deee584aad781f1a3b8e0ea5521 100644 (file)
--- a/tests/runtime/test-promise.scm
+++ b/tests/runtime/test-promise.scm
@@ -30,9 +30,7 @@ USA.
 \f
 (define-test 'force-force-delay-delay
   (lambda ()
-    (expect-error
-     (lambda ()
-       (assert-eqv (force (force (delay (delay 0)))) 0)))))
+    (assert-eqv (force (force (delay (delay 0)))) 0)))
 
 ;; Adapted from SRFI 45.