[commit: ghc] wip/T14677: Revert "WIP: a shot in the dark" (f3f2851)

[git at git.haskell.org]

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

On branch  : wip/T14677
Link       : http://ghc.haskell.org/trac/ghc/changeset/f3f285122a32ffcebaf5aad1acf4c2bb0c48e450/ghc

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

commit f3f285122a32ffcebaf5aad1acf4c2bb0c48e450
Author: Gabor Greif <ggreif at gmail.com>
Date:   Sat Jan 27 20:25:57 2018 +0100

    Revert "WIP: a shot in the dark"
    
    This reverts commit d47d32b5211831886910f8abc0431809ccacf0c8.


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

f3f285122a32ffcebaf5aad1acf4c2bb0c48e450
 compiler/codeGen/StgCmmExpr.hs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/compiler/codeGen/StgCmmExpr.hs b/compiler/codeGen/StgCmmExpr.hs
index f90aebc..3fcc935 100644
--- a/compiler/codeGen/StgCmmExpr.hs
+++ b/compiler/codeGen/StgCmmExpr.hs
@@ -738,16 +738,7 @@ cgIdApp fun_id args = do
         node_points dflags = nodeMustPointToIt dflags lf_info
     case getCallMethod dflags fun_name cg_fun_id lf_info n_args v_args (cg_loc fun_info) self_loop_info of
             -- A value in WHNF, so we can just return it.
-        EnterIt | Just con <- maybeIsLFCon lf_info -> pprPanic "maybeIsLFCon EnterIt" (ppr con)
-
         ReturnIt
-          -- | Just con <- maybeIsLFCon lf_info -> emitReturn [CmmLoad (CmmMachOp (MO_Add $ typeWidth $ gcWord dflags) [fun, CmmLit (CmmInt 7 $ typeWidth $ gcWord dflags)]) $ gcWord dflags]
-          | Just con <- maybeIsLFCon lf_info
-          , CmmLit (CmmLabelOff lab _) <- fun ->
-              let ty = gcWord dflags
-                  width = typeWidth ty
-                  offsLoad = CmmLoad (CmmMachOp (MO_Add width) [cmmUntag dflags fun, CmmLit (CmmInt 8 width)]) $ ty
-              in emitReturn [pprTrace "offsLoad" (ppr offsLoad) offsLoad]
           | isVoidTy (idType fun_id) -> emitReturn []
           | otherwise                -> emitReturn [fun]
           -- ToDo: does ReturnIt guarantee tagged?