Re: [C++ PATCH] For -gdwarf-5 emit DW_TAG_variable instead of DW_TAG_member for C++ static data members

[Jason Merrill]

On Fri, Feb 17, 2017 at 1:52 PM, Jakub Jelinek <ja...@redhat.com> wrote:
> -      && die->die_tag != DW_TAG_member)
> +      && die->die_tag != DW_TAG_member
> +      && (die->die_tag != DW_TAG_variable || !class_scope_p 
> (die->die_parent)))

How about we only check class_scope_p (die->die_parent), and don't
consider the TAG at all?  DW_TAG_member should only appear at class
scope.

> -         if (old_die->die_tag == DW_TAG_member)
> +         if (old_die->die_tag == DW_TAG_member
> +             || (dwarf_version >= 5 && class_scope_p (old_die->die_parent)))

Likewise here.

Jason