Patch to fix long-standing bug in forcing of promises.

diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c
index 6d5266db9e443bb61fe10d1d2169c13164abb77e..559c62281f4c31b3ea04035f95b7301e46f24cc9 100644 (file)
--- a/v7/src/microcode/interp.c
+++ b/v7/src/microcode/interp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.c,v 9.83 1994/06/02 19:03:31 cph Exp $
+$Id: interp.c,v 9.84 1994/06/02 19:13:16 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -2242,12 +2242,14 @@ Primitive_Internal_Apply:
     case RC_SNAP_NEED_THUNK:
       /* Don't snap thunk twice; evaluation of the thunk's body might
         have snapped it already.  */
-      if ((MEMORY_REF ((Fetch_Expression ()), THUNK_SNAPPED)) == SHARP_F)
+      if ((MEMORY_REF ((Fetch_Expression ()), THUNK_SNAPPED)) == SHARP_T)
+       Val = (MEMORY_REF ((Fetch_Expression ()), THUNK_VALUE));
+      else
        {
          MEMORY_SET ((Fetch_Expression ()), THUNK_SNAPPED, SHARP_T);
          MEMORY_SET ((Fetch_Expression ()), THUNK_VALUE, Val);
        }
-      break;
+     break;
 
     case RC_AFTER_MEMORY_UPDATE:
     case RC_BAD_INTERRUPT_CONTINUE:

diff --git a/v8/src/microcode/interp.c b/v8/src/microcode/interp.c
index 6d5266db9e443bb61fe10d1d2169c13164abb77e..559c62281f4c31b3ea04035f95b7301e46f24cc9 100644 (file)
--- a/v8/src/microcode/interp.c
+++ b/v8/src/microcode/interp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.c,v 9.83 1994/06/02 19:03:31 cph Exp $
+$Id: interp.c,v 9.84 1994/06/02 19:13:16 cph Exp $
 
 Copyright (c) 1988-94 Massachusetts Institute of Technology
 
@@ -2242,12 +2242,14 @@ Primitive_Internal_Apply:
     case RC_SNAP_NEED_THUNK:
       /* Don't snap thunk twice; evaluation of the thunk's body might
         have snapped it already.  */
-      if ((MEMORY_REF ((Fetch_Expression ()), THUNK_SNAPPED)) == SHARP_F)
+      if ((MEMORY_REF ((Fetch_Expression ()), THUNK_SNAPPED)) == SHARP_T)
+       Val = (MEMORY_REF ((Fetch_Expression ()), THUNK_VALUE));
+      else
        {
          MEMORY_SET ((Fetch_Expression ()), THUNK_SNAPPED, SHARP_T);
          MEMORY_SET ((Fetch_Expression ()), THUNK_VALUE, Val);
        }
-      break;
+     break;
 
     case RC_AFTER_MEMORY_UPDATE:
     case RC_BAD_INTERRUPT_CONTINUE: