Fix Trac #3017: ensure that we quantify over enough type variables when equalities...

[ghc-hetmet.git] / compiler / codeGen / StgCmmUtils.hs

diff --git a/compiler/codeGen/StgCmmUtils.hs b/compiler/codeGen/StgCmmUtils.hs
index 057e559..dc7fb8b 100644 (file)
--- a/compiler/codeGen/StgCmmUtils.hs
+++ b/compiler/codeGen/StgCmmUtils.hs
@@ -99,7 +99,7 @@ mkSimpleLit (MachWord i)      = CmmInt i wordWidth
 mkSimpleLit (MachWord64 i)    = CmmInt i W64
 mkSimpleLit (MachFloat r)     = CmmFloat r W32
 mkSimpleLit (MachDouble r)    = CmmFloat r W64
-mkSimpleLit (MachLabel fs ms) = CmmLabel (mkForeignLabel fs ms is_dyn)
+mkSimpleLit (MachLabel fs ms fod) = CmmLabel (mkForeignLabel fs ms is_dyn fod)
                              where
                                is_dyn = False  -- ToDo: fix me
 mkSimpleLit other            = pprPanic "mkSimpleLit" (ppr other)
@@ -883,10 +883,10 @@ getSRTInfo (SRTEntries {}) = panic "getSRTInfo"
 getSRTInfo (SRT off len bmp)
   | len > hALF_WORD_SIZE_IN_BITS || bmp == [fromIntegral srt_escape]
   = do         { id <- newUnique
-       ; top_srt <- getSRTLabel
+       -- ; top_srt <- getSRTLabel
         ; let srt_desc_lbl = mkLargeSRTLabel id
         -- JD: We're not constructing and emitting SRTs in the back end,
-        -- which renders this code wrong (and it now names a now-non-existent label).
+        -- which renders this code wrong (it now names a now-non-existent label).
        -- ; emitRODataLits srt_desc_lbl
         --      ( cmmLabelOffW top_srt off
        --        : mkWordCLit (fromIntegral len)