[commit: ghc] master: Cmm: Add missing cases for BlockInfoTable (d3b80c7)

git at git.haskell.org git at git.haskell.org
Tue Nov 28 20:53:16 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d3b80c79c2f906cd05066c374f4f19392033dfea/ghc

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

commit d3b80c79c2f906cd05066c374f4f19392033dfea
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Nov 28 14:32:34 2017 -0500

    Cmm: Add missing cases for BlockInfoTable
    
    Silly rabbit, BlockInfoTables are data. This fixes the unregisterised build,
    finally fixing #14454.


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

d3b80c79c2f906cd05066c374f4f19392033dfea
 compiler/cmm/CLabel.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index 689ebd0..0e87a88 100644
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -578,6 +578,7 @@ isSomeRODataLabel (IdLabel _ _ ClosureTable) = True
 isSomeRODataLabel (IdLabel _ _ ConInfoTable) = True
 isSomeRODataLabel (IdLabel _ _ InfoTable) = True
 isSomeRODataLabel (IdLabel _ _ LocalInfoTable) = True
+isSomeRODataLabel (IdLabel _ _ BlockInfoTable) = True
 -- static reference tables defined in haskell (.hs)
 isSomeRODataLabel (IdLabel _ _ SRT) = True
 isSomeRODataLabel (SRTLabel _) = True
@@ -938,6 +939,7 @@ idInfoLabelType info =
   case info of
     InfoTable     -> DataLabel
     LocalInfoTable -> DataLabel
+    BlockInfoTable -> DataLabel
     Closure       -> GcPtrLabel
     ConInfoTable  -> DataLabel
     ClosureTable  -> DataLabel



More information about the ghc-commits mailing list