patch applied (ghc-7.0/ghc): MERGED: Changeset 296388e81bd8557449a2027f8e8fa664307b5944

[Ian Lynagh]

Sat May 28 06:51:09 PDT 2011  Ian Lynagh <igloo at earth.li>
  * MERGED: Changeset 296388e81bd8557449a2027f8e8fa664307b5944
  
  The fix for #4914 was wrong and broke other things (see #5149). We
  can't emit the ffrees before a conditional jump, because we don't want
  to ffree the stack registers if the jump isn't taken (d'oh).
  
  This commit fixes it properly, by moving the pass that inserts the
  ffrees to *before* we do the jump-shortcutting which introduces the
  conditional non-local jumps.

    M ./compiler/nativeGen/AsmCodeGen.lhs -12 +18
    M ./compiler/nativeGen/X86/Instr.hs -1 +1

View patch online:
http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-7.0/ghc;a=darcs_commitdiff;h=20110528135109-3fd76-223757613b2e82d175bec2b1167e264c33940219.gz