* [c-family] Reduce usage of limited_with clauses with -fdump-ada-spec
@ 2022-05-18 14:32 Eric Botcazou
0 siblings, 0 replies; only message in thread
From: Eric Botcazou @ 2022-05-18 14:32 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
The problem is that subtypes are not part of the limited view of a package so
we need to use types in conjunction with limited_with clauses, which is not
always desirable since this yields less portable Ada bindings. The patch
also contains a small enhancement for complex floating-point types.
Tested on x86-64/Linux, applied on mainline and 12 branch.
2022-05-18 Eric Botcazou <ebotcazou@adacore.com>
* c-ada-spec.cc (dump_ada_node) <COMPLEX_TYPE>: Deal with usual
floating-point complex types.
<POINTER_TYPE>: Do not use limited_with clause if the designated
type is a scalar type.
--
Eric Botcazou
[-- Attachment #2: p.diff --]
[-- Type: text/x-patch, Size: 2348 bytes --]
diff --git a/gcc/c-family/c-ada-spec.cc b/gcc/c-family/c-ada-spec.cc
index f291e150934..faf71742522 100644
--- a/gcc/c-family/c-ada-spec.cc
+++ b/gcc/c-family/c-ada-spec.cc
@@ -2105,6 +2105,21 @@ dump_ada_node (pretty_printer *buffer, tree node, tree type, int spc,
append_withs ("Interfaces.C.Extensions", false);
pp_string (buffer, "Extensions.CFloat_128");
}
+ else if (TREE_TYPE (node) == float_type_node)
+ {
+ append_withs ("Ada.Numerics.Complex_Types", false);
+ pp_string (buffer, "Ada.Numerics.Complex_Types.Complex");
+ }
+ else if (TREE_TYPE (node) == double_type_node)
+ {
+ append_withs ("Ada.Numerics.Long_Complex_Types", false);
+ pp_string (buffer, "Ada.Numerics.Long_Complex_Types.Complex");
+ }
+ else if (TREE_TYPE (node) == long_double_type_node)
+ {
+ append_withs ("Ada.Numerics.Long_Long_Complex_Types", false);
+ pp_string (buffer, "Ada.Numerics.Long_Long_Complex_Types.Complex");
+ }
else
pp_string (buffer, "<complex>");
break;
@@ -2190,7 +2205,7 @@ dump_ada_node (pretty_printer *buffer, tree node, tree type, int spc,
{
tree ref_type = TREE_TYPE (node);
const unsigned int quals = TYPE_QUALS (ref_type);
- bool is_access = false;
+ bool is_access;
if (VOID_TYPE_P (ref_type))
{
@@ -2242,7 +2257,10 @@ dump_ada_node (pretty_printer *buffer, tree node, tree type, int spc,
}
if (!package_prefix)
- pp_string (buffer, "access");
+ {
+ is_access = false;
+ pp_string (buffer, "access");
+ }
else if (AGGREGATE_TYPE_P (ref_type))
{
if (!type || TREE_CODE (type) != FUNCTION_DECL)
@@ -2256,17 +2274,21 @@ dump_ada_node (pretty_printer *buffer, tree node, tree type, int spc,
pp_string (buffer, "all ");
}
else if (quals & TYPE_QUAL_CONST)
- pp_string (buffer, "in ");
+ {
+ is_access = false;
+ pp_string (buffer, "in ");
+ }
else
{
is_access = true;
pp_string (buffer, "access ");
- /* ??? should be configurable: access or in out. */
}
}
else
{
- is_access = true;
+ /* We want to use regular with clauses for scalar types,
+ as they are not involved in circular declarations. */
+ is_access = false;
pp_string (buffer, "access ");
if (!name_only)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-18 14:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-18 14:32 [c-family] Reduce usage of limited_with clauses with -fdump-ada-spec Eric Botcazou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).