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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7aa15ca8ed7b37efbd970822a3e0a3fe5e8a9c8a

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

commit 7aa15ca8ed7b37efbd970822a3e0a3fe5e8a9c8a
Author: Edward Z. Yang <[email protected]>
Date:   Wed Apr 27 17:54:15 2011 +0100

    Fix bug in multi-destination jump patching.
    
    Signed-off-by: Edward Z. Yang <[email protected]>

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

 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs 
b/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
index 903082f..ef6ae9b 100644
--- a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
@@ -190,7 +190,7 @@ joinToTargets_again
                 _      -> let  instr'  =  patchJumpInstr instr 
                                                (\bid -> if bid == dest 
                                                                then mkBlockId 
fixup_block_id 
-                                                               else dest)
+                                                               else bid) -- no 
change!
                                                
                           in   joinToTargets' block_live (block : new_blocks) 
block_id instr' dests
 



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to