aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/sem_ch12.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2016-07-04 12:48:48 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2016-07-04 12:48:48 +0200
commit1d2d8a8f5a35b317abe53360082e275e44d3947b (patch)
treee812936d2406313b9dc6dbc4e53acba719c3368e /gcc/ada/sem_ch12.adb
parente49de265efb67ef2e21cb5ca623b5de264a492b7 (diff)
downloadgcc-1d2d8a8f5a35b317abe53360082e275e44d3947b.zip
gcc-1d2d8a8f5a35b317abe53360082e275e44d3947b.tar.gz
gcc-1d2d8a8f5a35b317abe53360082e275e44d3947b.tar.bz2
[multiple changes]
2016-07-04 Ed Schonberg <schonberg@adacore.com> * sem_ch4.adb (Compatible_Types_In_Predicate): New function to handle cases where a formal of a predicate function and the corresponding actual have different views of the same type. 2016-07-04 Philippe Gil <gil@adacore.com> * g-debpoo.adb (Free_Blocks) free blocks also until Logically_Deallocated less than Maximum_Logically_Freed_Memory (Dump) add dump of number of traceback & validity elements already allocated. 2016-07-04 Justin Squirek <squirek@adacore.com> * sem_ch12.adb (Instantiate_Package_Body): Add a guard to ignore Itypes which fail when installing primitives. From-SVN: r237973
Diffstat (limited to 'gcc/ada/sem_ch12.adb')
-rw-r--r--gcc/ada/sem_ch12.adb10
1 files changed, 6 insertions, 4 deletions
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 02fe102..f21ebc5 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -10932,6 +10932,7 @@ package body Sem_Ch12 is
E := First_Entity (Act_Decl_Id);
while Present (E) loop
if Is_Type (E)
+ and then not Is_Itype (E)
and then Is_Generic_Actual_Type (E)
and then Is_Tagged_Type (E)
then
@@ -12855,10 +12856,11 @@ package body Sem_Ch12 is
-- or in the declaration of the main unit, which in this last case must
-- be a body.
- return Current_Unit = Cunit (Main_Unit)
- or else Current_Unit = Library_Unit (Cunit (Main_Unit))
- or else (Present (Library_Unit (Current_Unit))
- and then Is_In_Main_Unit (Library_Unit (Current_Unit)));
+ return
+ Current_Unit = Cunit (Main_Unit)
+ or else Current_Unit = Library_Unit (Cunit (Main_Unit))
+ or else (Present (Library_Unit (Current_Unit))
+ and then Is_In_Main_Unit (Library_Unit (Current_Unit)));
end Is_In_Main_Unit;
----------------------------