patch applied (ghc-7.0/ghc): MERGED: Changeset 296388e81bd8557449a2027f8e8fa664307b5944
igloo at earth.li
Sat May 28 18:17:28 CEST 2011
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:
More information about the Cvs-ghc