[commit: ghc] supercompiler: Fix longstanding bug in stateType calculation for primop stack frames (7f4593a)
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/7f4593a26cc9f13e02fac132df0ad1eafad173bb >--------------------------------------------------------------- commit 7f4593a26cc9f13e02fac132df0ad1eafad173bb Author: Max Bolingbroke <[email protected]> Date: Mon Feb 20 16:31:42 2012 +0000 Fix longstanding bug in stateType calculation for primop stack frames >--------------------------------------------------------------- .../supercompile/Supercompile/Evaluator/Syntax.hs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/compiler/supercompile/Supercompile/Evaluator/Syntax.hs b/compiler/supercompile/Supercompile/Evaluator/Syntax.hs index a8cfb1a..957925d 100644 --- a/compiler/supercompile/Supercompile/Evaluator/Syntax.hs +++ b/compiler/supercompile/Supercompile/Evaluator/Syntax.hs @@ -265,7 +265,7 @@ stackFrameType kf hole_ty = case tagee kf of CoApply co -> hole_ty `applyFunTy` coercionType co Apply x -> hole_ty `applyFunTy` idType x Scrutinise _ ty _ -> ty - PrimApply pop tys in_as in_es -> ((primOpType pop `applyTys` tys) `applyFunTys` map answerType in_as) `applyFunTys` map (\in_e@(rn, e) -> termType (renameAnnedTerm (mkInScopeSet (inFreeVars annedFreeVars in_e)) rn e)) in_es + PrimApply pop tys in_as in_es -> ((primOpType pop `applyTys` tys) `applyFunTys` map answerType in_as) `applyFunTy` hole_ty `applyFunTys` map (\in_e@(rn, e) -> termType (renameAnnedTerm (mkInScopeSet (inFreeVars annedFreeVars in_e)) rn e)) in_es StrictLet _ in_e@(rn, e) -> termType (renameAnnedTerm (mkInScopeSet (inFreeVars annedFreeVars in_e)) rn e) Update _ -> hole_ty CastIt co -> pSnd (coercionKind co)