[commit: ghc] wip/T14626: WIP: checkpoint (edf094d)

[git at git.haskell.org]

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

On branch  : wip/T14626
Link       : http://ghc.haskell.org/trac/ghc/changeset/edf094d641821adb56c0bcd27b7d91d2a21bfced/ghc

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

commit edf094d641821adb56c0bcd27b7d91d2a21bfced
Author: Gabor Greif <ggreif at gmail.com>
Date:   Mon Jan 15 07:55:52 2018 +0100

    WIP: checkpoint


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

edf094d641821adb56c0bcd27b7d91d2a21bfced
 compiler/codeGen/StgCmmCon.hs | 5 +++--
 compiler/utils/Outputable.hs  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/codeGen/StgCmmCon.hs b/compiler/codeGen/StgCmmCon.hs
index a00081c..bc3d69c 100644
--- a/compiler/codeGen/StgCmmCon.hs
+++ b/compiler/codeGen/StgCmmCon.hs
@@ -258,8 +258,9 @@ buildDynCon' dflags _ binder actually_bound ccs con args
 
       checkTagOnPtr base (((NonVoid (StgVarArg var)),offset), bang)
           | isBanged bang
-          , isAlgType (let ty = idType var in pprTrace "checkTagOnPtrTy" (ppr ty) ty)
-           = do lgood <- newBlockId
+          , let ty = idType var
+          , isAlgType ty
+           = do lgood <- pprTrace "checkTagOnPtr#Ty" (ppr ty) newBlockId
                 lcall <- newBlockId
                 let p = CmmLoad (cmmOffsetB dflags base offset) (bWord dflags)
                 emit $ mkCbranch (cmmIsTagged dflags p)
diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs
index fd0de1e..793b8fb 100644
--- a/compiler/utils/Outputable.hs
+++ b/compiler/utils/Outputable.hs
@@ -321,7 +321,7 @@ code (either C or assembly), or generating interface files.
 newtype SDoc = SDoc { runSDoc :: SDocContext -> Doc }
 
 data SDocContext = SDC
-  { sdocStyle      :: PprStyle
+  { sdocStyle      :: !PprStyle
   , sdocLastColour :: !Col.PprColour
     -- ^ The most recently used colour.  This allows nesting colours.
   , sdocDynFlags   :: !DynFlags