c-ada-spec.c (get_underlying_decl): Get to the main type variant.

* c-ada-spec.c (get_underlying_decl): Get to the main type variant.
	(dump_ada_node): Add const keyword.

From-SVN: r264738
This commit is contained in:
Eric Botcazou 2018-10-01 09:39:28 +00:00 committed by Eric Botcazou
parent e04108c727
commit 6cc430c19a
2 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2018-10-01 Eric Botcazou <ebotcazou@adacore.com>
* c-ada-spec.c (get_underlying_decl): Get to the main type variant.
(dump_ada_node): Add const keyword.
2018-09-25 Martin Liska <mliska@suse.cz>
* c-common.c (c_common_truthvalue_conversion):

View File

@ -1020,13 +1020,18 @@ get_underlying_decl (tree type)
if (DECL_P (type))
return type;
/* type is a typedef. */
if (TYPE_P (type) && TYPE_NAME (type) && DECL_P (TYPE_NAME (type)))
return TYPE_NAME (type);
if (TYPE_P (type))
{
type = TYPE_MAIN_VARIANT (type);
/* TYPE_STUB_DECL has been set for type. */
if (TYPE_P (type) && TYPE_STUB_DECL (type))
return TYPE_STUB_DECL (type);
/* type is a typedef. */
if (TYPE_NAME (type) && DECL_P (TYPE_NAME (type)))
return TYPE_NAME (type);
/* TYPE_STUB_DECL has been set for type. */
if (TYPE_STUB_DECL (type))
return TYPE_STUB_DECL (type);
}
return NULL_TREE;
}
@ -2143,8 +2148,8 @@ dump_ada_node (pretty_printer *buffer, tree node, tree type, int spc,
}
else
{
const unsigned int quals = TYPE_QUALS (TREE_TYPE (node));
bool is_access = false;
unsigned int quals = TYPE_QUALS (TREE_TYPE (node));
if (VOID_TYPE_P (TREE_TYPE (node)))
{