[commit: ghc] wip/T14626: WIP: cleanups (95212cd)

[git at git.haskell.org]

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

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

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

commit 95212cdf6d1742f1bc5bd44ced3d0d51712d985e
Author: Gabor Greif <ggreif at gmail.com>
Date:   Thu Dec 28 10:58:55 2017 +0100

    WIP: cleanups
    
    and add TODO
    
    (also this should be more performant, by consing less)


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

95212cdf6d1742f1bc5bd44ced3d0d51712d985e
 compiler/codeGen/StgCmmClosure.hs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs
index 15a123e..9ce952e 100644
--- a/compiler/codeGen/StgCmmClosure.hs
+++ b/compiler/codeGen/StgCmmClosure.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE CPP, RecordWildCards, StandaloneDeriving #-}
-{-# OPTIONS_GHC -Wno-orphans #-}
+{-# LANGUAGE CPP, RecordWildCards #-}
+
 -----------------------------------------------------------------------------
 --
 -- Stg to C-- code generation:
@@ -225,13 +225,8 @@ data LambdaFormInfo
                         -- always a value, needs evaluation
 
   | LFLetNoEscape       -- See LetNoEscape module for precise description
- deriving Show
 
-deriving instance Show TopLevelFlag
-deriving instance Show OneShotInfo
-deriving instance Show ArgDescr
-deriving instance Show StandardFormInfo
-instance Show DataCon where show _ = "<DATACON>"
+
 -------------------------
 -- StandardFormInfo tells whether this thunk has one of
 -- a small number of standard forms
@@ -592,9 +587,9 @@ getCallMethod dflags name id (LFReEntrant _ _ arity _ _) n_args _v_args _cg_loc
 getCallMethod _ _name _ LFUnlifted n_args _v_args _cg_loc _self_loop_info
   = ASSERT( n_args == 0 ) ReturnIt
 
-getCallMethod _ name id (LFUnknown False) 0 _v_args cg_loc _self_loop_info
-  | occNameString (nameOccName name) == "wild"
-  = pprTrace "getCallMethod" (ppr id <+> ppr cg_loc) ReturnIt
+getCallMethod _ name _ (LFUnknown False) 0 _v_args cg_loc _self_loop_info
+  | occNameString (nameOccName name) == "wild" -- TODO: make this robust
+  = ReturnIt -- seems to come from case, must be (tagged) WHNF already
 
 getCallMethod _ _name _ (LFCon _) n_args _v_args _cg_loc _self_loop_info
   = ASSERT( n_args == 0 ) ReturnIt