4 files changed, 9 insertions, 9 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs
index 8bff8fd6e5..fb53f4caf8 100644
--- a/compiler/llvmGen/LlvmCodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen.hs
@@ -117,7 +117,7 @@ llvmGroupLlvmGens cmm = do
               -- Set function type
               let l' = case mapLookup (g_entry g) h of
                          Nothing                   -> l
-                         Just (Statics info_lbl _) -> info_lbl
+                         Just (RawCmmStatics info_lbl _) -> info_lbl
               lml <- strCLabel_llvm l'
               funInsert lml =<< llvmFunTy live
               return Nothing
@@ -131,7 +131,7 @@ llvmGroupLlvmGens cmm = do
 -- -----------------------------------------------------------------------------
 -- | Do LLVM code generation on all these Cmms data sections.
 --
-cmmDataLlvmGens :: [(Section,CmmStatics)] -> LlvmM ()
+cmmDataLlvmGens :: [(Section,RawCmmStatics)] -> LlvmM ()
 
 cmmDataLlvmGens statics
   = do lmdatas <- mapM genLlvmData statics
diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs
index 41b7fcc562..0da437ef18 100644
--- a/compiler/llvmGen/LlvmCodeGen/Base.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Base.hs
@@ -72,7 +72,7 @@ import qualified Data.List.NonEmpty as NE
 -- * Some Data Types
 --
 
-type LlvmCmmDecl = GenCmmDecl [LlvmData] (Maybe CmmStatics) (ListGraph LlvmStatement)
+type LlvmCmmDecl = GenCmmDecl [LlvmData] (Maybe RawCmmStatics) (ListGraph LlvmStatement)
 type LlvmBasicBlock = GenBasicBlock LlvmStatement
 
 -- | Global registers live on proc entry
diff --git a/compiler/llvmGen/LlvmCodeGen/Data.hs b/compiler/llvmGen/LlvmCodeGen/Data.hs
index 46fb1afbcd..d44ecaea20 100644
--- a/compiler/llvmGen/LlvmCodeGen/Data.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Data.hs
@@ -42,9 +42,9 @@ linkage lbl = if externallyVisibleCLabel lbl
 --
 
 -- | Pass a CmmStatic section to an equivalent Llvm code.
-genLlvmData :: (Section, CmmStatics) -> LlvmM LlvmData
+genLlvmData :: (Section, RawCmmStatics) -> LlvmM LlvmData
 -- See note [emit-time elimination of static indirections] in CLabel.
-genLlvmData (_, Statics alias [CmmStaticLit (CmmLabel lbl), CmmStaticLit ind, _, _])
+genLlvmData (_, RawCmmStatics alias [CmmStaticLit (CmmLabel lbl), CmmStaticLit ind, _, _])
   | lbl == mkIndStaticInfoLabel
   , let labelInd (CmmLabelOff l _) = Just l
         labelInd (CmmLabel l) = Just l
@@ -67,7 +67,7 @@ genLlvmData (_, Statics alias [CmmStaticLit (CmmLabel lbl), CmmStaticLit ind, _,
 
     pure ([LMGlobal aliasDef $ Just orig], [tyAlias])
 
-genLlvmData (sec, Statics lbl xs) = do
+genLlvmData (sec, RawCmmStatics lbl xs) = do
     label <- strCLabel_llvm lbl
     static <- mapM genData xs
     lmsec <- llvmSection sec
diff --git a/compiler/llvmGen/LlvmCodeGen/Ppr.hs b/compiler/llvmGen/LlvmCodeGen/Ppr.hs
index 5fcc72f25a..576e84dda4 100644
--- a/compiler/llvmGen/LlvmCodeGen/Ppr.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Ppr.hs
@@ -45,8 +45,8 @@ pprLlvmCmmDecl (CmmData _ lmdata)
 
 pprLlvmCmmDecl (CmmProc mb_info entry_lbl live (ListGraph blks))
   = do let lbl = case mb_info of
-                     Nothing                   -> entry_lbl
-                     Just (Statics info_lbl _) -> info_lbl
+                     Nothing -> entry_lbl
+                     Just (RawCmmStatics info_lbl _) -> info_lbl
            link = if externallyVisibleCLabel lbl
                       then ExternallyVisible
                       else Internal
@@ -62,7 +62,7 @@ pprLlvmCmmDecl (CmmProc mb_info entry_lbl live (ListGraph blks))
        -- generate the info table
        prefix <- case mb_info of
                      Nothing -> return Nothing
-                     Just (Statics _ statics) -> do
+                     Just (RawCmmStatics _ statics) -> do
                        infoStatics <- mapM genData statics
                        let infoTy = LMStruct $ map getStatType infoStatics
                        return $ Just $ LMStaticStruc infoStatics infoTy