[Git][ghc/ghc][wip/with2-primop] 2 commits: Fix STG lint

[Ben Gamari]

Ben Gamari pushed to branch wip/with2-primop at Glasgow Haskell Compiler / GHC


Commits:
33845797 by Ben Gamari at 2020-04-16T01:46:46+00:00
Fix STG lint

- - - - -
23744e1d by Ben Gamari at 2020-04-16T01:46:57+00:00
StmToCmm error

- - - - -


2 changed files:

- compiler/GHC/Stg/Lint.hs
- compiler/GHC/StgToCmm/Closure.hs


Changes:

=====================================
compiler/GHC/Stg/Lint.hs
=====================================
@@ -54,6 +54,8 @@ import ErrUtils             ( MsgDoc, Severity(..), mkLocMessage )
 import GHC.Core.Type
 import GHC.Types.RepType
 import GHC.Types.SrcLoc
+import GHC.Types.Unique     ( hasKey )
+import PrelNames            ( keepAliveIdKey )
 import Outputable
 import GHC.Types.Module           ( Module )
 import qualified ErrUtils as Err


=====================================
compiler/GHC/StgToCmm/Closure.hs
=====================================
@@ -626,7 +626,7 @@ getCallMethod _ _name _ LFLetNoEscape _n_args _v_args (LneLoc blk_id lne_regs)
               _self_loop_info
   = JumpToIt blk_id lne_regs
 
-getCallMethod _ name _ lf_info _ _ _ _ = pprPanic "Unknown call method" (ppr name $$ ppr lf_info)
+getCallMethod _ name _ lf_info _ _ _ _ = pprPanic "Unknown call method" (ppr name)
 
 -----------------------------------------------------------------------------
 --              Data types for closure information



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/354d630c8258e4f81058962a5399036014a5cbd7...23744e1d12f09366783c50efefeee466d5a5bf42

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/354d630c8258e4f81058962a5399036014a5cbd7...23744e1d12f09366783c50efefeee466d5a5bf42
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200415/c5973994/attachment.html>