diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-03-24 13:21:37 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-03-24 13:21:37 +0100 |
| commit | 5f6061af2d05babf0c0053d51592a0612d23a196 (patch) | |
| tree | 42a7063186ce09fb0980b3c941c8107925470e21 | |
| parent | a62638a3485c7fb31085a2b0fb973af618ae61d3 (diff) | |
| download | gcc-5f6061af2d05babf0c0053d51592a0612d23a196.zip gcc-5f6061af2d05babf0c0053d51592a0612d23a196.tar.gz gcc-5f6061af2d05babf0c0053d51592a0612d23a196.tar.bz2 | |
[multiple changes]
2015-03-24 Ed Schonberg <schonberg@adacore.com>
* sem_ch13.adb (Rep_Item_Too_Early): allow pragma Convention
on generic type.
2015-03-24 Gary Dismukes <dismukes@adacore.com>
* inline.adb: Minor typo fix.
From-SVN: r221629
| -rw-r--r-- | gcc/ada/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/ada/inline.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index dc0f853..e0613e5 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2015-03-24 Ed Schonberg <schonberg@adacore.com> + + * sem_ch13.adb (Rep_Item_Too_Early): allow pragma Convention + on generic type. + +2015-03-24 Gary Dismukes <dismukes@adacore.com> + + * inline.adb: Minor typo fix. + 2015-03-24 Arnaud Charlet <charlet@adacore.com> * doc/gnat_ugn/building_executable_programs_with_gnat.rst, diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index 936b056..cf53aae 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -1337,7 +1337,7 @@ package body Inline is is function Has_Formal_With_Discriminant_Dependent_Fields (Id : Entity_Id) return Boolean; - -- Returns true if the subprogram has at least one formal parameters of + -- Returns true if the subprogram has at least one formal parameter of -- an unconstrained record type with per-object constraints on component -- types. diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index fc23010..6f68e9a 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -11738,6 +11738,8 @@ package body Sem_Ch13 is elsif Is_Type (T) and then Is_Generic_Type (Root_Type (T)) + and then (Nkind (N) /= N_Pragma + or else Get_Pragma_Id (N) /= Pragma_Convention) then Error_Msg_N ("representation item not allowed for generic type", N); return True; |