snames.ads-tmpl: Minor change to list Loop_(In)variant not in configuration pragma.

2013-04-24  Yannick Moy  <moy@adacore.com>

	* snames.ads-tmpl: Minor change to list
	Loop_(In)variant not in configuration pragma.
	* sem_ch3.adb (Analyze_Declarations): Do not look at the original node
	for analyzing the expressions in pre/postconditions.

From-SVN: r198239

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 91c529c5e87bbfe3002446103be72a477aa385e8..34a91d1c0f1dc5c34d0fab59ab0f0877066c28d2 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-24  Yannick Moy  <moy@adacore.com>
+
+       * snames.ads-tmpl: Minor change to list
+       Loop_(In)variant not in configuration pragma.
+       * sem_ch3.adb (Analyze_Declarations): Do not look at the original node
+       for analyzing the expressions in pre/postconditions.
+
 2013-04-24  Robert Dewar  <dewar@adacore.com>
 
        * gnatcmd.adb, xref_lib.adb, gnatls.adb, sem_ch13.adb: Minor

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index da964c06672ffce4d1479707eedca4495df22e2a..af2cc231675da4ef4ff7d98411461a39c303299d 100644 (file)
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -2187,17 +2187,14 @@ package body Sem_Ch3 is
       --  delayed visibility requirement.
 
       declare
-         Decl      : Node_Id;
-         Subp_Decl : Node_Id;
-         Subp_Id   : Entity_Id;
+         Decl    : Node_Id;
+         Subp_Id : Entity_Id;
 
       begin
          Decl := First (L);
          while Present (Decl) loop
-            Subp_Decl := Original_Node (Decl);
-
-            if Nkind (Subp_Decl) = N_Subprogram_Declaration then
-               Subp_Id := Defining_Unit_Name (Specification (Subp_Decl));
+            if Nkind (Decl) = N_Subprogram_Declaration then
+               Subp_Id := Defining_Unit_Name (Specification (Decl));
                Analyze_Subprogram_Contract (Subp_Id);
             end if;
 

diff --git a/gcc/ada/snames.ads-tmpl b/gcc/ada/snames.ads-tmpl
index f8e807c2475b522542ca7ec1a4c5dfb5e59f5c8b..320bf76e657ce6ef4d3005971194817a0743a562 100644 (file)
--- a/gcc/ada/snames.ads-tmpl
+++ b/gcc/ada/snames.ads-tmpl
@@ -411,9 +411,7 @@ package Snames is
    Name_License                        : constant Name_Id := N + $; -- GNAT
    Name_Locking_Policy                 : constant Name_Id := N + $;
    Name_Long_Float                     : constant Name_Id := N + $; -- VMS
-   Name_Loop_Invariant                 : constant Name_Id := N + $; -- GNAT
    Name_Loop_Optimize                  : constant Name_Id := N + $; -- GNAT
-   Name_Loop_Variant                   : constant Name_Id := N + $; -- GNAT
    Name_No_Run_Time                    : constant Name_Id := N + $; -- GNAT
    Name_No_Strict_Aliasing             : constant Name_Id := N + $; -- GNAT
    Name_Normalize_Scalars              : constant Name_Id := N + $;
@@ -549,6 +547,8 @@ package Snames is
    --  of the type Pragma_Id, and the functions Get_Pragma_Id and Is_Pragma_Id
    --  correctly recognize and process Lock_Free. Lock_Free is a GNAT pragma.
 
+   Name_Loop_Invariant                 : constant Name_Id := N + $; -- GNAT
+   Name_Loop_Variant                   : constant Name_Id := N + $; -- GNAT
    Name_Machine_Attribute              : constant Name_Id := N + $; -- GNAT
    Name_Main                           : constant Name_Id := N + $; -- GNAT
    Name_Main_Storage                   : constant Name_Id := N + $; -- GNAT
@@ -1721,9 +1721,7 @@ package Snames is
       Pragma_License,
       Pragma_Locking_Policy,
       Pragma_Long_Float,
-      Pragma_Loop_Invariant,
       Pragma_Loop_Optimize,
-      Pragma_Loop_Variant,
       Pragma_No_Run_Time,
       Pragma_No_Strict_Aliasing,
       Pragma_Normalize_Scalars,
@@ -1827,6 +1825,8 @@ package Snames is
       Pragma_Linker_Options,
       Pragma_Linker_Section,
       Pragma_List,
+      Pragma_Loop_Invariant,
+      Pragma_Loop_Variant,
       Pragma_Machine_Attribute,
       Pragma_Main,
       Pragma_Main_Storage,