fix a few sloppy conditionals caught by new test in CmmLint

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

diff --git a/rts/Exception.cmm b/rts/Exception.cmm
index f4327b9..5c2ee95 100644 (file)
--- a/rts/Exception.cmm
+++ b/rts/Exception.cmm
@@ -119,7 +119,7 @@ unblockAsyncExceptionszh_fast
     /* Args: R1 :: IO a */
     STK_CHK_GEN( WDS(2), R1_PTR, unblockAsyncExceptionszh_fast);
 
-    if (TO_W_(StgTSO_flags(CurrentTSO)) & TSO_BLOCKEX) {
+    if ((TO_W_(StgTSO_flags(CurrentTSO)) & TSO_BLOCKEX) != 0) {
        foreign "C" awakenBlockedExceptionQueue(MyCapability() "ptr", 
                                                CurrentTSO "ptr") [R1];
 
@@ -148,7 +148,7 @@ killThreadzh_fast
     target = R1;
     exception = R2;
     
-    STK_CHK_GEN( WDS(3), R1_PTR | R2_PTR, killThreadzh_fast);
+    STK_CHK_GEN( WDS(3), R1_PTR & R2_PTR, killThreadzh_fast);
 
     /* 
      * We might have killed ourselves.  In which case, better be *very*