GHC.Base.breakpoint isn't vaporware anymore.

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

diff --git a/ghc/rts/StgMiscClosures.cmm b/ghc/rts/StgMiscClosures.cmm
index 4a69eb2..70d08ae 100644 (file)
--- a/ghc/rts/StgMiscClosures.cmm
+++ b/ghc/rts/StgMiscClosures.cmm
@@ -338,14 +338,14 @@ INFO_TABLE(stg_BLACKHOLE,0,1,BLACKHOLE,"BLACKHOLE","BLACKHOLE")
 
     TICK_ENT_BH();
 
-#ifdef SMP
+#ifdef THREADED_RTS
     // foreign "C" debugBelch("BLACKHOLE entry\n");
 #endif
 
     /* Actually this is not necessary because R1 is about to be destroyed. */
     LDV_ENTER(R1);
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     foreign "C" ACQUIRE_LOCK(sched_mutex "ptr");
     // released in stg_block_blackhole_finally
 #endif
@@ -406,11 +406,11 @@ INFO_TABLE(stg_CAF_BLACKHOLE,0,1,CAF_BLACKHOLE,"CAF_BLACKHOLE","CAF_BLACKHOLE")
     TICK_ENT_BH();
     LDV_ENTER(R1);
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     // foreign "C" debugBelch("BLACKHOLE entry\n");
 #endif
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     foreign "C" ACQUIRE_LOCK(sched_mutex "ptr");
     // released in stg_block_blackhole_finally
 #endif
@@ -435,9 +435,13 @@ INFO_TABLE(stg_SE_CAF_BLACKHOLE,0,1,SE_CAF_BLACKHOLE,"SE_CAF_BLACKHOLE","SE_CAF_
 #endif
 
 /* ----------------------------------------------------------------------------
+   Whiteholes are used for the "locked" state of a closure (see lockClosure())
+
+   The closure type is BLAKCHOLE, just because we need a valid closure type
+   for sanity checking.
    ------------------------------------------------------------------------- */
 
-INFO_TABLE(stg_WHITEHOLE, 0,0, INVALID_OBJECT, "WHITEHOLE", "WHITEHOLE")
+INFO_TABLE(stg_WHITEHOLE, 0,0, BLACKHOLE, "WHITEHOLE", "WHITEHOLE")
 { foreign "C" barf("WHITEHOLE object entered!"); }
 
 /* ----------------------------------------------------------------------------