diff options
| author | Jan Stolarek <jan.stolarek@p.lodz.pl> | 2013-09-18 09:25:56 +0100 |
|---|---|---|
| committer | Jan Stolarek <jan.stolarek@p.lodz.pl> | 2013-09-18 10:14:33 +0100 |
| commit | 7a4c15a0ee045ac5d2b48865997c7f5e8697afa3 (patch) | |
| tree | 0a11f85c2714a39b7b8bba95946e5ee738242090 /compiler/codeGen | |
| parent | b626989d737521617e90327bcc2814a9c2ba8231 (diff) | |
| download | haskell-7a4c15a0ee045ac5d2b48865997c7f5e8697afa3.tar.gz | |
Add flag to control loopification
It is off by default, which is meant to be a workaround for #8275.
Once #8275 is fixed we will enable this option by default.
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/StgCmmClosure.hs | 5 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmExpr.hs | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs index 04297b4258..627c189f12 100644 --- a/compiler/codeGen/StgCmmClosure.hs +++ b/compiler/codeGen/StgCmmClosure.hs @@ -527,9 +527,10 @@ getCallMethod :: DynFlags -> Maybe SelfLoopInfo -- can we perform a self-recursive tail call? -> CallMethod -getCallMethod _ _ id _ n_args _cg_loc (Just (self_loop_id, block_id, args)) - | id == self_loop_id, n_args == length args +getCallMethod dflags _ id _ n_args _cg_loc (Just (self_loop_id, block_id, args)) + | gopt Opt_Loopification dflags, id == self_loop_id, n_args == length args -- If these patterns match then we know that: + -- * loopification optimisation is turned on -- * function is performing a self-recursive call in a tail position -- * number of parameters of the function matches functions arity. -- See Note [Self-recursive tail calls] in StgCmmExpr for more details diff --git a/compiler/codeGen/StgCmmExpr.hs b/compiler/codeGen/StgCmmExpr.hs index c7fddd49dc..2f2cdbba14 100644 --- a/compiler/codeGen/StgCmmExpr.hs +++ b/compiler/codeGen/StgCmmExpr.hs @@ -744,7 +744,12 @@ cgIdApp fun_id args = do -- recursive tail call when (a) environment stores information about -- possible self tail-call; (b) that tail call is to a function currently -- being compiled; (c) number of passed arguments is equal to function's --- arity. +-- arity. (d) loopification is turned on via -floopification command-line +-- option. +-- +-- * Command line option to control turn loopification on and off is +-- implemented in DynFlags +-- emitEnter :: CmmExpr -> FCode ReturnKind |