[PATCH 1/2] dbghelp: Recompute location after fixing it

[André Hentschel]

This fixes 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.

Problem is that the kind of location was not updated after the location was adjusted.

Reported-by: Austin English 
Signed-off-by: André Hentschel 
---
 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;

[Austin English]

On Mon, Jul 2, 2018 at 3:52 PM, André Hentschel  wrote:
> This fixes 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.
>
> Problem is that the kind of location was not updated after the location was adjusted.
>
> Reported-by: Austin English 
> Signed-off-by: André Hentschel
>
> 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;
>
> --
> 2.7.4

I can confirm this patch fixes the assertion and gives e.g.,
tests/dxgi/tests/device.c an actual backtrace now.