=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: dbghelp: Recompute location after fixing it.

Alexandre Julliard julliard at winehq.org
Tue Jul 3 15:58:56 CDT 2018


Module: wine
Branch: master
Commit: 3d482d3f9f0a3ffa69540af87594b3c1dc46e07b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3d482d3f9f0a3ffa69540af87594b3c1dc46e07b

Author: André Hentschel <nerv at dawncrow.de>
Date:   Mon Jul  2 15:52:42 2018 +0200

dbghelp: Recompute location after fixing it.

Fix a assertion raised by every exception with newer clang versions (>3.7) at least on ARM64:
../../../dlls/dbghelp/dwarf.c:1641: void dwarf2_parse_variable(dwarf2_subprogram_t *, struct symt_block *, dwarf2_debug_info_t *): Assertion `subpgm->func' failed.

Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dbghelp/dwarf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c
index 1a75a79..dc3ec29 100644
--- a/dlls/dbghelp/dwarf.c
+++ b/dlls/dbghelp/dwarf.c
@@ -942,6 +942,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx,
             *ptr = xloc.u.block.size;
             memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size);
             loc->offset = (unsigned long)ptr;
+            compute_location(&lctx, loc, NULL, frame);
         }
     }
     return TRUE;




More information about the wine-cvs mailing list