X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FInterpreter.c;h=5a564ba40ffe623de04b3d4e9accbef3cce54d56;hb=971c88597b0972053975c9c99aa51764ab75b143;hp=b95d5a903064d111cdfe1d1704c148fa3141f9ca;hpb=35beb255958545f401f4f2229953a6355d09476c;p=ghc-hetmet.git

diff --git a/rts/Interpreter.c b/rts/Interpreter.c
index b95d5a9..5a564ba 100644
--- a/rts/Interpreter.c
+++ b/rts/Interpreter.c
@@ -11,16 +11,17 @@
 
 // internal headers
 #include "sm/Storage.h"
+#include "sm/Sanity.h"
 #include "RtsUtils.h"
 #include "Schedule.h"
 #include "Updates.h"
-#include "Sanity.h"
 #include "Prelude.h"
 #include "Stable.h"
 #include "Printer.h"
 #include "Disassembler.h"
 #include "Interpreter.h"
 #include "ThreadPaused.h"
+#include "Threads.h"
 
 #include <string.h>     /* for memcpy */
 #ifdef HAVE_ERRNO_H
@@ -275,9 +276,7 @@ eval_obj:
     switch ( get_itbl(obj)->type ) {
 
     case IND:
-    case IND_OLDGEN:
     case IND_PERM:
-    case IND_OLDGEN_PERM:
     case IND_STATIC:
     { 
 	tagged_obj = ((StgInd*)obj)->indirectee;
@@ -443,7 +442,8 @@ do_return:
         // to a PAP by the GC, violating the invariant that PAPs
         // always contain a tagged pointer to the function.
 	INTERP_TICK(it_retto_UPDATE);
-	UPD_IND(((StgUpdateFrame *)Sp)->updatee, tagged_obj); 
+        updateThunk(cap, cap->r.rCurrentTSO, 
+                    ((StgUpdateFrame *)Sp)->updatee, tagged_obj);
 	Sp += sizeofW(StgUpdateFrame);
 	goto do_return;