[commit: ghc] wip/kavon-nosplit-llvm: fix another mistake in merge conflict (44ff660)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/kavon-nosplit-llvm
Link       : http://ghc.haskell.org/trac/ghc/changeset/44ff66072108cf5c065aeca779d0d86d0dd237a4/ghc

>---------------------------------------------------------------

commit 44ff66072108cf5c065aeca779d0d86d0dd237a4
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Wed May 16 17:35:23 2018 -0500

    fix another mistake in merge conflict


>---------------------------------------------------------------

44ff66072108cf5c065aeca779d0d86d0dd237a4
 compiler/cmm/CmmBuildInfoTables.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/cmm/CmmBuildInfoTables.hs b/compiler/cmm/CmmBuildInfoTables.hs
index 2969ff0..af1fb43 100644
--- a/compiler/cmm/CmmBuildInfoTables.hs
+++ b/compiler/cmm/CmmBuildInfoTables.hs
@@ -437,7 +437,7 @@ emptySRT mod =
 --   - the closure label for a top-level function (not a CAF)
 getLabelledBlocks :: CmmDeclPlus -> [(Label, CAFLabel)]
 getLabelledBlocks (CmmData _ _) = []
-getLabelledBlocks (CmmProc top_info _ _ _) =
+getLabelledBlocks (CmmProc (top_info,_) _ _ _) =
   [ (blockId, mkCAFLabel (cit_lbl info))
   | (blockId, info) <- mapToList (info_tbls top_info)
   , let rep = cit_rep info
@@ -454,7 +454,7 @@ getLabelledBlocks (CmmProc top_info _ _ _) =
 --    resolve references in the CAF's SRT.
 getCAFs :: CmmDeclPlus -> [(Label, CAFLabel)]
 getCAFs (CmmData _ _) = []
-getCAFs (CmmProc top_info topLbl _ g)
+getCAFs (CmmProc (top_info,_) topLbl _ g)
   | Just info <- mapLookup (g_entry g) (info_tbls top_info)
   , let rep = cit_rep info
   , isStaticRep rep && isThunkRep rep = [(g_entry g, mkCAFLabel topLbl)]
@@ -465,7 +465,7 @@ getCAFs (CmmProc top_info topLbl _ g)
 -- SRT we can merge it with the static closure. [FUN]
 getStaticFuns :: CmmDeclPlus -> [(BlockId, CLabel)]
 getStaticFuns (CmmData _ _) = []
-getStaticFuns (CmmProc top_info _ _ g)
+getStaticFuns (CmmProc (top_info,_) _ _ g)
   | Just info <- mapLookup (g_entry g) (info_tbls top_info)
   , let rep = cit_rep info
   , Just (id, _) <- cit_clo info
@@ -718,11 +718,11 @@ updInfoSRTs
   -> CmmDeclPlus
   -> [CmmDeclPlus]
 
-updInfoSRTs dflags srt_env funSRTEnv (CmmProc top_info top_l live g)
+updInfoSRTs dflags srt_env funSRTEnv (CmmProc (top_info, rty) top_l live g)
   | Just (_,closure) <- maybeStaticClosure = [ proc, closure ]
   | otherwise = [ proc ]
   where
-    proc = CmmProc top_info { info_tbls = newTopInfo } top_l live g
+    proc = CmmProc (top_info { info_tbls = newTopInfo }, rty) top_l live g
     newTopInfo = mapMapWithKey updInfoTbl (info_tbls top_info)
     updInfoTbl l info_tbl
       | l == g_entry g, Just (inf, _) <- maybeStaticClosure = inf