[commit: ghc] supercompiler: Fix subtle bug where annotated variable free variables would not be renamed (eb54295)

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : supercompiler

http://hackage.haskell.org/trac/ghc/changeset/eb54295530edb521ceca81dc06a0dce212010433

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

commit eb54295530edb521ceca81dc06a0dce212010433
Author: Max Bolingbroke <[email protected]>
Date:   Fri Jul 1 13:52:21 2011 +0100

    Fix subtle bug where annotated variable free variables would not be renamed

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

 .../Supercompile/Evaluator/Evaluate.hs             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/compiler/supercompile/Supercompile/Evaluator/Evaluate.hs b/compiler/supercompile/Supercompile/Evaluator/Evaluate.hs
index ed88d68..5583ae3 100644
--- a/compiler/supercompile/Supercompile/Evaluator/Evaluate.hs
+++ b/compiler/supercompile/Supercompile/Evaluator/Evaluate.hs
@@ -89,7 +89,7 @@ step' normalising state =
     go (deeds, heap@(Heap h ids), k, (rn, e)) 
      | Just anned_a <- termToAnswer ids (rn, e) = go_answer (deeds, heap, k, anned_a)
      | otherwise = case annee e of
-        Var x            -> go_question (deeds, heap, k, fmap (const (renameId rn x)) e)
+        Var x            -> go_question (deeds, heap, k, annedVar (annedTag e) (renameId rn x))
         Value v          -> pprPanic "step': values are always answers" (ppr v)
         TyApp e ty       -> go (deeds, heap,        Tagged tg (TyApply (renameType ids rn ty))                                   : k, (rn, e))
         App e x          -> go (deeds, heap,        Tagged tg (Apply (renameId rn x))                                            : k, (rn, e))