[commit: ghc] wip/libdw-unwind: iFix "Allow anywhere" (ed23b49)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/libdw-unwind
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed23b494a51c6544da2061377e8e0b07671bd890/ghc

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

commit ed23b494a51c6544da2061377e8e0b07671bd890
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Jan 3 02:22:31 2016 +0100

    iFix "Allow anywhere"


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

ed23b494a51c6544da2061377e8e0b07671bd890
 compiler/nativeGen/Dwarf.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/nativeGen/Dwarf.hs b/compiler/nativeGen/Dwarf.hs
index e946a14..beb44b1 100644
--- a/compiler/nativeGen/Dwarf.hs
+++ b/compiler/nativeGen/Dwarf.hs
@@ -229,7 +229,7 @@ procToFrame initUws blk
         flatten b at DebugBlock{ dblPosition=pos, dblUnwind=uws, dblBlocks=blocks }
           | Just p <- pos  = (p, (b, uws')):nested
           | otherwise      = nested -- block was optimized out
-          where uws'   = map (\(UnwindDecl lbl uw) -> UnwindDecl lbl (initUws `Map.union` uw)) uws
+          where uws'   = map (\(UnwindDecl lbl uw) -> UnwindDecl lbl (uw `Map.union` initUws)) uws
                 nested = concatMap flatten blocks
 
         -- | If the current procedure has an info table, then we also say that