Re: [PATCH 1/1] gdb/dwarf, fortran: Use the function scope for DW_TAG_imported_declaration

[Tom Tromey <tom@tromey.com>]

>>>>> Abdul Basit Ijaz <abdul.b.ijaz@intel.com> writes:

> All Fortran imported variable aliases (`use module, alias => var`) were
> being added to "global scope", regardless of whether they appeared in:
> - Program/module scope (should be global)
> - Function scope (should be local)

Thanks for the patch.

>      case DW_TAG_imported_declaration:
> +      sym->set_domain (TYPE_DOMAIN);
> +      sym->set_loc_class_index (LOC_TYPEDEF);
> +      /* For Fortran imported declarations, use current scope context
> +	 rather than forcing global scope.  This ensures variable aliases
> +	 are scoped correctly (function-level, module-level, or
> +	 program-level).  */
> +      if (cu->lang () == language_fortran)
> +	list_to_add = cu->list_in_scope;
> +      else
> +	list_to_add = &cu->get_builder ()->get_global_symbols ();

I wonder if this could simply omit the 'if' and do the "usual"
file->global transform like:

	      list_to_add
		= ((cu->list_in_scope
		    == &cu->get_builder ()->get_file_symbols ())
		   ? &cu->get_builder ()->get_global_symbols ()
		   : cu->list_in_scope);

That is, do we know for sure that there's some language requiring that a
local import be stuffed into the global scope?

I tend to think such DWARF wouldn't exist and the code would be easier
to maintain in the long run without a fortran-specific check.

Would you mind giving this a try?

thanks,
Tom