aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2009-04-10 17:27:27 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2009-04-10 17:27:27 +0200
commit934a3a25802c8652fab728259b779c3ae59e5c1e (patch)
tree18f772cc26efda100ec73485971be219e84db360
parentab8e1b353ed60724667bfeaf0d07fc37c9fffff4 (diff)
downloadgcc-934a3a25802c8652fab728259b779c3ae59e5c1e.zip
gcc-934a3a25802c8652fab728259b779c3ae59e5c1e.tar.gz
gcc-934a3a25802c8652fab728259b779c3ae59e5c1e.tar.bz2
[multiple changes]
2009-04-10 Thomas Quinot <quinot@adacore.com> * exp_attr.adb: Minor reformatting 2009-04-10 Robert Dewar <dewar@adacore.com> * sem_aux.adb: Minor reformatting 2009-04-10 Ed Schonberg <schonberg@adacore.com> * sem_prag.adb (Check_Precondition_Postcondition): Within a generic, analyze the expression for a postcondition, even if the compiler mode is Generate_Code. From-SVN: r145923
-rw-r--r--gcc/ada/ChangeLog10
-rw-r--r--gcc/ada/exp_attr.adb4
-rwxr-xr-xgcc/ada/sem_aux.adb2
-rw-r--r--gcc/ada/sem_prag.adb4
4 files changed, 15 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 237d756..97ba0a6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-10 Thomas Quinot <quinot@adacore.com>
+
+ * exp_attr.adb: Minor reformatting
+
+2009-04-10 Ed Schonberg <schonberg@adacore.com>
+
+ * sem_prag.adb (Check_Precondition_Postcondition): Within a generic,
+ analyze the expression for a postcondition, even if the compiler mode
+ is Generate_Code.
+
2009-04-10 Robert Dewar <dewar@adacore.com>
* sem_aux.adb: Minor reformatting
diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 6c3d1d4..d1d6ee9 100644
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -1346,7 +1346,6 @@ package body Exp_Attr is
begin
-- We have an object of a task interface class-wide type as a prefix
-- to Callable. Generate:
-
-- callable (Task_Id (Pref._disp_get_task_id));
if Ada_Version >= Ada_05
@@ -4361,7 +4360,7 @@ package body Exp_Attr is
Analyze_And_Resolve (N, RTE (RE_Tag));
end if;
- -- (Ada 2005 (AI-251): The use of 'Tag in the sources always
+ -- Ada 2005 (AI-251): The use of 'Tag in the sources always
-- references the primary tag of the actual object. If 'Tag is
-- applied to class-wide interface objects we generate code that
-- displaces "this" to reference the base of the object.
@@ -4408,7 +4407,6 @@ package body Exp_Attr is
begin
-- The prefix of Terminated is of a task interface class-wide type.
-- Generate:
-
-- terminated (Task_Id (Pref._disp_get_task_id));
if Ada_Version >= Ada_05
diff --git a/gcc/ada/sem_aux.adb b/gcc/ada/sem_aux.adb
index 9f7342a..f2f55ce 100755
--- a/gcc/ada/sem_aux.adb
+++ b/gcc/ada/sem_aux.adb
@@ -119,7 +119,7 @@ package body Sem_Aux is
elsif Nkind (D) = N_Object_Renaming_Declaration then
return Renamed_Object (Ent);
- -- If this is a component declaration whose entity is constant, it is
+ -- If this is a component declaration whose entity is a constant, it is
-- a prival within a protected function (and so has no constant value).
elsif Nkind (D) = N_Component_Declaration then
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 6f4e07f..af7cf60 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -1456,7 +1456,9 @@ package body Sem_Prag is
if Nkind (Parent (N)) = N_Subprogram_Body
and then List_Containing (N) = Declarations (Parent (N))
then
- if Operating_Mode /= Generate_Code then
+ if Operating_Mode /= Generate_Code
+ or else Inside_A_Generic
+ then
-- Analyze expression in pragma, for correctness
-- and for ASIS use.