[commit: ghc] supercompiler: Trace upon rollback (8bb16db)
Max Bolingbroke <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : supercompiler http://hackage.haskell.org/trac/ghc/changeset/8bb16db29609438805c6e541cc3942fc3cd882ee >--------------------------------------------------------------- commit 8bb16db29609438805c6e541cc3942fc3cd882ee Author: Max Bolingbroke <[email protected]> Date: Wed Nov 14 15:14:59 2012 +0000 Trace upon rollback >--------------------------------------------------------------- .../supercompile/Supercompile/Drive/Process3.hs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/compiler/supercompile/Supercompile/Drive/Process3.hs b/compiler/supercompile/Supercompile/Drive/Process3.hs index 53bd689..1331952 100644 --- a/compiler/supercompile/Supercompile/Drive/Process3.hs +++ b/compiler/supercompile/Supercompile/Drive/Process3.hs @@ -271,7 +271,7 @@ terminateM :: String -> State -> (forall b. RollbackState -> ScpM b) -> ScpM a - terminateM h state rb mcont mstop = ScpM $ StateT $ \s -> ReaderT $ \env -> case ({-# SCC "terminate" #-} terminate (if hISTORY_TREE then scpProcessHistoryEnv env else scpProcessHistoryState s) (scpNodeKey env, (h, state, rb))) of Stop (_, (shallow_h, shallow_state, shallow_rb)) -> trace ("stops: " ++ show (scpStopCount env)) $ - unReaderT (unStateT (unScpM (mstop shallow_h shallow_state shallow_rb)) s) (env { scpStopCount = scpStopCount env + 1}) + unReaderT (unStateT (unScpM (mstop shallow_h shallow_state (\x -> trace ("back to " ++ show shallow_h) (shallow_rb x)))) s) (env { scpStopCount = scpStopCount env + 1}) Continue hist' -> unReaderT (unStateT (unScpM mcont) (s { scpProcessHistoryState = hist' })) (env { scpNodeKey = generatedKey hist', scpProcessHistoryEnv = hist' }) -- TODO: record the names of the h-functions on the way to the current one instead of a Int depth