X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FHsVersions.h;h=748b0319c8d497e6a9fec50786100c792d7a82c8;hb=63489d40bdee972656ff115ab2309b809c0e39fc;hp=09c8d2efed3f3caf300b19fa6b26abb9120d2213;hpb=5b2b8d3547136c6d271c38b4a21cba3c1d7d51b1;p=ghc-hetmet.git

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index 09c8d2e..748b031 100644
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -30,11 +30,20 @@ you will screw up the layout where they are used in case expressions!
 {-# NOINLINE name #-};             \
 name :: IORef (ty);                \
 name = Util.global (value);
+
+#define GLOBAL_MVAR(name,value,ty) \
+{-# NOINLINE name #-};             \
+name :: MVar (ty);                 \
+name = Util.globalMVar (value);
 #endif
 #else /* __HADDOCK__ */
 #define GLOBAL_VAR(name,value,ty)  \
 name :: IORef (ty);                \
 name = Util.global (value);
+
+#define GLOBAL_MVAR(name,value,ty) \
+name :: MVar (ty);                 \
+name = Util.globalMVar (value);
 #endif
 
 #define COMMA ,
@@ -51,7 +60,7 @@ name = Util.global (value);
 -- We have to actually use all the variables we are given or we may get
 -- unused variable warnings when DEBUG is off.
 #define ASSERT(e)      if False && (not (e)) then panic "ASSERT" else
-#define ASSERT2(e,msg) if False && (not (e)) then pprPanic "ASSERT2" (msg) else
+#define ASSERT2(e,msg) if False && (const False (e,msg)) then pprPanic "ASSERT2" (msg) else
 #define MASSERT(e)      ASSERT(e) return ()
 #define MASSERT2(e,msg) ASSERT2(e,msg) return ()
 #define ASSERTM(e)       do { let { _mbool = (e) } }