validate fixes

diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index 7dde9f9..31749d4 100644 (file)
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -530,6 +530,7 @@ needsCDecl ModuleRegdLabel          = False
 needsCDecl (StringLitLabel _)          = False
 needsCDecl (AsmTempLabel _)            = False
 needsCDecl (RtsLabel _)                        = False
+needsCDecl (CmmLabel _ _ _)            = False
 needsCDecl l@(ForeignLabel _ _ _ _)    = not (isMathFun l)
 needsCDecl (CC_Label _)                        = True
 needsCDecl (CCS_Label _)               = True

diff --git a/compiler/codeGen/StgCmmHeap.hs b/compiler/codeGen/StgCmmHeap.hs
index d7eafe3..4163723 100644 (file)
--- a/compiler/codeGen/StgCmmHeap.hs
+++ b/compiler/codeGen/StgCmmHeap.hs
@@ -389,7 +389,7 @@ altHeapCheck regs code
     gc_call updfr_sz
        | null regs = mkCall generic_gc (GC, GC) [] [] updfr_sz
 
-       | Just gc_lbl <- rts_label regs -- Canned call
+       | Just _gc_lbl <- rts_label regs        -- Canned call
        = panic "StgCmmHeap.altHeapCheck: rts_label not finished"
                -- mkCall    (CmmLit (CmmLabel (mkRtsCodeLabel gc_lbl))) (GC, GC)
                --          regs (map (CmmReg . CmmLocal) regs) updfr_sz