From 6d49f958de0de5665c3d9028d53652fa579027ea Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Tue, 8 Mar 2011 21:30:42 +0100 Subject: [PATCH] dbghelp: More precisely manage the inline attribute. --- dlls/dbghelp/dwarf.c | 3 ++- dlls/dbghelp/dwarf.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 776031e51d9..72993142e98 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1764,7 +1764,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* if it's an abstract representation of an inline function, there should be * a concrete object that we'll handle */ - if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags)) + if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags) && + inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n", name.u.string ? name.u.string : "(null)", inline_flags.u.uvalue); diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 9864eccdfc8..f0557beab23 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -475,3 +475,8 @@ enum dwarf_call_frame_info #define DW_EH_PE_aligned 0x50 #define DW_EH_PE_indirect 0x80 #define DW_EH_PE_omit 0xff + +#define DW_INL_not_inlined 0x00 +#define DW_INL_inlined 0x01 +#define DW_INL_declared_not_inlined 0x02 +#define DW_INL_declared_inlined 0x03