mark recordMutableCap() with [R1] to avoid saving all regs across it

[ghc-hetmet.git] / ghc / rts / Updates.h

diff --git a/ghc/rts/Updates.h b/ghc/rts/Updates.h
index c5af055..5872157 100644 (file)
--- a/ghc/rts/Updates.h
+++ b/ghc/rts/Updates.h
@@ -186,7 +186,7 @@ extern void awakenBlockedQueue(StgBlockingQueueElement *q, StgClosure *node);
  * already have been updated (the mutable list will get messed up
  * otherwise).
  *
- * NB. We do *not* do this in SMP mode, because when we have the
+ * NB. We do *not* do this in THREADED_RTS mode, because when we have the
  * possibility of multiple threads entering the same closure, zeroing
  * the slop in one of the threads would have a disastrous effect on
  * the other (seen in the wild!).
@@ -249,7 +249,7 @@ FILL_SLOP(StgClosure *p)
 
 #endif /* CMINUSMINUS */
 
-#if !defined(DEBUG) || defined(SMP)
+#if !defined(DEBUG) || defined(THREADED_RTS)
 #define DEBUG_FILL_SLOP(p) /* do nothing */
 #else
 #define DEBUG_FILL_SLOP(p) FILL_SLOP(p)
@@ -278,7 +278,7 @@ FILL_SLOP(StgClosure *p)
     if (bdescr_gen_no(bd) != 0 :: CInt) {                      \
       foreign "C" recordMutableCap(p1 "ptr",                   \
                                   MyCapability() "ptr",        \
-                                  bdescr_gen_no(bd));          \
+                                  bdescr_gen_no(bd)) [R1];     \
       SET_INFO(p1, stg_IND_OLDGEN_info);                       \
       LDV_RECORD_CREATE(p1);                                   \
       TICK_UPD_OLD_IND();                                      \