diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-30 13:45:14 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-30 13:45:14 +0000 |
| commit | 04495e05da5e8f83198d94c0da49491ca4a0ab90 (patch) | |
| tree | 70b3d40fd28031a1b7c00a173295c5a9d1961bf5 | |
| parent | a7abc72e3d282b08955f418c945d7cf7c1a368f9 (diff) | |
| download | gcc-04495e05da5e8f83198d94c0da49491ca4a0ab90.tar.gz | |
2014-07-30 Bob Duff <duff@adacore.com>
* s-tataat.adb, s-tataat.ads, a-tasatt.adb: Minor comment fixes.
2014-07-30 Ed Schonberg <schonberg@adacore.com>
* sem_ch5.adb (Analyze_Loop_Statement): If loop has a label,
verify that it is not hidden by an inner implicit declaration.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213266 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ada/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/ada/a-tasatt.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/s-tataat.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/s-tataat.ads | 4 | ||||
| -rw-r--r-- | gcc/ada/sem_ch5.adb | 7 |
5 files changed, 22 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 499853eb9df..68f15b73b60 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2014-07-30 Bob Duff <duff@adacore.com> + + * s-tataat.adb, s-tataat.ads, a-tasatt.adb: Minor comment fixes. + +2014-07-30 Ed Schonberg <schonberg@adacore.com> + + * sem_ch5.adb (Analyze_Loop_Statement): If loop has a label, + verify that it is not hidden by an inner implicit declaration. + 2014-07-30 Thomas Quinot <quinot@adacore.com> * sem.ads (Scope_Table_Entry): New component Locked_Shared_Objects. diff --git a/gcc/ada/a-tasatt.adb b/gcc/ada/a-tasatt.adb index bd7f4a74e90..015f6253b8f 100644 --- a/gcc/ada/a-tasatt.adb +++ b/gcc/ada/a-tasatt.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1995-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 2014, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -51,7 +51,7 @@ package body Ada.Task_Attributes is type Attribute_Cleanup is new Limited_Controlled with null record; procedure Finalize (Cleanup : in out Attribute_Cleanup); - -- Finalize all tasks' attribute for this package + -- Finalize all tasks' attributes for this package Cleanup : Attribute_Cleanup; pragma Unreferenced (Cleanup); diff --git a/gcc/ada/s-tataat.adb b/gcc/ada/s-tataat.adb index 14440263fb4..fbdb52a33d6 100644 --- a/gcc/ada/s-tataat.adb +++ b/gcc/ada/s-tataat.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1995-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 2014, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -43,7 +43,7 @@ package body System.Tasking.Task_Attributes is end record; -- Used is True if a given index is used by an instantiation of -- Ada.Task_Attributes, False otherwise. - -- Require_Finalization is True is the attribute requires finalization. + -- Require_Finalization is True if the attribute requires finalization. Index_Array : array (1 .. Max_Attribute_Count) of Index_Info := (others => (False, False)); diff --git a/gcc/ada/s-tataat.ads b/gcc/ada/s-tataat.ads index 878dc40d34d..16661ae2c5f 100644 --- a/gcc/ada/s-tataat.ads +++ b/gcc/ada/s-tataat.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1995-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 2014, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -40,7 +40,7 @@ package System.Tasking.Task_Attributes is type Attribute_Record is record Free : Deallocator; end record; - -- The real type is declared in Ada.Task_Attributes body: Real_Attribute + -- The real type is declared in Ada.Task_Attributes body: Real_Attribute. -- As long as the first field is the deallocator we are good. type Attribute_Access is access all Attribute_Record; diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb index c52f242d8f4..863d488ebd7 100644 --- a/gcc/ada/sem_ch5.adb +++ b/gcc/ada/sem_ch5.adb @@ -2834,6 +2834,13 @@ package body Sem_Ch5 is raise Program_Error; end if; + -- Verify that the loop name is hot hidden by an unrelated + -- declaration in an inner scope. + + elsif Ekind (Ent) /= E_Label and then Ekind (Ent) /= E_Loop then + Error_Msg_Sloc := Sloc (Ent); + Error_Msg_N ("implicit label declaration for & is hidden#", Id); + else Generate_Reference (Ent, N, ' '); Generate_Definition (Ent); |