From e6bdd0396c69b8f08da394aca0687fb46c188b4a Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sun, 30 May 2010 12:01:55 +0000 Subject: [PATCH] decl.c (gnat_to_gnu_entity): Reuse the TYPE_DECL of the equivalent type instead of building a new one. * gcc-interface/decl.c (gnat_to_gnu_entity) : Reuse the TYPE_DECL of the equivalent type instead of building a new one. From-SVN: r160049 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/decl.c | 4 ++-- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gnat.dg/prot2.adb | 23 +++++++++++++++++++++++ gcc/testsuite/gnat.dg/prot2.ads | 5 +++++ gcc/testsuite/gnat.dg/prot2_pkg1.ads | 5 +++++ gcc/testsuite/gnat.dg/prot2_pkg2.adb | 23 +++++++++++++++++++++++ gcc/testsuite/gnat.dg/prot2_pkg2.ads | 17 +++++++++++++++++ 8 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/prot2.adb create mode 100644 gcc/testsuite/gnat.dg/prot2.ads create mode 100644 gcc/testsuite/gnat.dg/prot2_pkg1.ads create mode 100644 gcc/testsuite/gnat.dg/prot2_pkg2.adb create mode 100644 gcc/testsuite/gnat.dg/prot2_pkg2.ads diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 53a4260eb32..7b909f81f8a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2010-05-30 Eric Botcazou + + * gcc-interface/decl.c (gnat_to_gnu_entity) : Reuse the + TYPE_DECL of the equivalent type instead of building a new one. + 2010-05-30 Eric Botcazou * gcc-interface/decl.c (gnat_to_gnu_entity): Adjust warning message. diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 71679fd1cbc..0fd7753e1ae 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -4382,11 +4382,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) case E_Task_Subtype: case E_Protected_Type: case E_Protected_Subtype: + /* Concurrent types are always transformed into their record type. */ if (type_annotate_only && No (gnat_equiv_type)) gnu_type = void_type_node; else - gnu_type = gnat_to_gnu_type (gnat_equiv_type); - + gnu_decl = gnat_to_gnu_entity (gnat_equiv_type, NULL_TREE, 0); maybe_present = true; break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f6848fccd78..43f44786694 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-05-30 Eric Botcazou + + * gnat.dg/prot2.ad[sb]: New test. + * gnat.dg/prot2_pkg1.ads: New helper. + * gnat.dg/prot2_pkg2.ad[sb]: Likewise. + 2010-05-30 Eric Botcazou * gnat.dg/array11.adb: Adjust dg-warning directive. diff --git a/gcc/testsuite/gnat.dg/prot2.adb b/gcc/testsuite/gnat.dg/prot2.adb new file mode 100644 index 00000000000..cc6fcab8fe6 --- /dev/null +++ b/gcc/testsuite/gnat.dg/prot2.adb @@ -0,0 +1,23 @@ +-- { dg-do compile } + +with Prot2_Pkg1; +with Prot2_Pkg2; + +package body Prot2 is + + type A is array (1 .. Prot2_Pkg1.Num) of Integer; + + type E is (One, Two); + + type Rec (D : E := One) is record + case D is + when One => L : A; + when Two => null; + end case; + end record; + + package My_Pkg2 is new Prot2_Pkg2 (Rec); + + procedure Dummy is begin null; end; + +end Prot2; diff --git a/gcc/testsuite/gnat.dg/prot2.ads b/gcc/testsuite/gnat.dg/prot2.ads new file mode 100644 index 00000000000..d388fc7d097 --- /dev/null +++ b/gcc/testsuite/gnat.dg/prot2.ads @@ -0,0 +1,5 @@ +package Prot2 is + + procedure Dummy; + +end Prot2; diff --git a/gcc/testsuite/gnat.dg/prot2_pkg1.ads b/gcc/testsuite/gnat.dg/prot2_pkg1.ads new file mode 100644 index 00000000000..2e71aacfcdc --- /dev/null +++ b/gcc/testsuite/gnat.dg/prot2_pkg1.ads @@ -0,0 +1,5 @@ +package Prot2_Pkg1 is + + function Num return Natural; + +end Prot2_Pkg1; diff --git a/gcc/testsuite/gnat.dg/prot2_pkg2.adb b/gcc/testsuite/gnat.dg/prot2_pkg2.adb new file mode 100644 index 00000000000..503cce73d17 --- /dev/null +++ b/gcc/testsuite/gnat.dg/prot2_pkg2.adb @@ -0,0 +1,23 @@ +with Unchecked_Deallocation; + +package body Prot2_Pkg2 is + + protected type Rec is + private + M : T; + end Rec; + + protected body Rec is end; + + procedure Create (B : out Id) is + begin + B := new Rec; + end; + + procedure Delete (B : in out Id) is + procedure Free is new Unchecked_Deallocation(Object => Rec, Name => Id); + begin + Free (B); + end; + +end Prot2_Pkg2; diff --git a/gcc/testsuite/gnat.dg/prot2_pkg2.ads b/gcc/testsuite/gnat.dg/prot2_pkg2.ads new file mode 100644 index 00000000000..cdd436b8afb --- /dev/null +++ b/gcc/testsuite/gnat.dg/prot2_pkg2.ads @@ -0,0 +1,17 @@ +generic + + type T is private; + +package Prot2_Pkg2 is + + type Id is private; + + procedure Create (B : out Id); + procedure Delete (B : in out Id); + +private + + type Rec; + type Id is access Rec; + +end Prot2_Pkg2;