[commit: ghc] ghc-7.10: Restore unwind information generation (2f7eb6c)

[git at git.haskell.org]

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/2f7eb6c74f4c7f0f6ea4eea476cf56bdbb7d0d62/ghc

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

commit 2f7eb6c74f4c7f0f6ea4eea476cf56bdbb7d0d62
Author: Peter Wortmann <scpmw at leeds.ac.uk>
Date:   Fri Apr 3 00:23:56 2015 -0500

    Restore unwind information generation
    
    While we want to reduce the amount of information generated into
    debug_info, it really doesn't make sense to remove block information
    for unwinding.
    
    This is a simple oversight introduced in 4ab57024, which severly
    reduces the usefulness of generated unwind data. Thanks to bitonic
    for spotting this!
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D792
    
    GHC Trac Issues: #10236
    
    (cherry picked from commit 59f7a7b6091e9c0564f3f370d09398d8c9cd8ad5)


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

2f7eb6c74f4c7f0f6ea4eea476cf56bdbb7d0d62
 compiler/nativeGen/Dwarf.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/nativeGen/Dwarf.hs b/compiler/nativeGen/Dwarf.hs
index d7c2f61..ff86fd8 100644
--- a/compiler/nativeGen/Dwarf.hs
+++ b/compiler/nativeGen/Dwarf.hs
@@ -35,11 +35,11 @@ dwarfGen df modLoc us blocks = do
   -- Convert debug data structures to DWARF info records
   -- We strip out block information, as it is not currently useful for
   -- anything. In future we might want to only do this for -g1.
-  let procs = map stripBlocks $ debugSplitProcs blocks
+  let procs = debugSplitProcs blocks
       stripBlocks dbg = dbg { dblBlocks = [] }
   compPath <- getCurrentDirectory
   let dwarfUnit = DwarfCompileUnit
-        { dwChildren = map (procToDwarf df) procs
+        { dwChildren = map (procToDwarf df) (map stripBlocks procs)
         , dwName = fromMaybe "" (ml_hs_file modLoc)
         , dwCompDir = addTrailingPathSeparator compPath
         , dwProducer = cProjectName ++ " " ++ cProjectVersion