tso->link is now tso->_link (fix after merge with HEAD)

[ghc-hetmet.git] / rts / Exception.cmm

diff --git a/rts/Exception.cmm b/rts/Exception.cmm
index daa8e4f..cba5d48 100644 (file)
--- a/rts/Exception.cmm
+++ b/rts/Exception.cmm
@@ -73,6 +73,14 @@ INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, RET_SMALL )
          */
         Sp_adj(1);
 #endif
+        STK_CHK_GEN( WDS(2), R1_PTR, stg_unblockAsyncExceptionszh_ret_info);
+        Sp_adj(-2);
+        Sp(1) = R1;
+#ifdef REG_R1
+        Sp(0) = stg_gc_unpt_r1_info;
+#else
+        Sp(0) = stg_ut_1_0_unreg_info;
+#endif
         SAVE_THREAD_STATE();
         (r) = foreign "C" maybePerformBlockedException (MyCapability() "ptr", 
                                                      CurrentTSO "ptr") [R1];
@@ -214,7 +222,7 @@ killThreadzh_fast
      */
   loop:
     if (StgTSO_what_next(target) == ThreadRelocated::I16) {
-        target = StgTSO_link(target);
+        target = StgTSO__link(target);
         goto loop;
     }
     if (target == CurrentTSO) {