2017-05-02 Bob Duff <duff@adacore.com>

	* sem_attr.adb (Attribute_Enum_Rep): Disallow T'Enum_Rep.

2017-05-02  Vasiliy Fofanov  <fofanov@adacore.com>

	* s-os_lib.ads: Minor typo fix.

2017-05-02  Vasiliy Fofanov  <fofanov@adacore.com>

	* gnatls.adb: Merge and refactor code from Prj.Env and remove
	this deprecated dependency.

2017-05-02  Ed Schonberg  <schonberg@adacore.com>

	* exp_util.ads: minor comment addition.

2017-05-02  Eric Botcazou  <ebotcazou@adacore.com>

	* sem_ch3.adb (Build_Derived_Record_Type): Fix a few typos and
	pastos in part #3 of the head comment.

2017-05-02  Ed Schonberg  <schonberg@adacore.com>

	* exp_ch3.adb (Freeze_Type): Do not generate an invariant
	procedure body for a local (sub)type declaration within a
	predicate function. Invariant checks do not apply to these, and
	the expansion of the procedure will happen in the wrong scope,
	leading to misplaced freeze nodes.

2017-05-02  Ed Schonberg  <schonberg@adacore.com>

	* exp_util.adb (Insert_Library_Level_Action): Use proper scope
	to analyze generated actions.  If the main unit is a body,
	the required scope is that of the corresponding unit declaration.

2017-05-02  Arnaud Charlet  <charlet@adacore.com>

	* einfo.adb (Declaration_Node): flip branches of
	an IF statement to avoid repeated negations in its condition;
	no change in semantics, only to improve readability.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@247480 138bc75d-0d04-0410-961f-82ee72b054a4

Author: charlet

gcc/ada/ChangeLog

@@ -1,3 +1,45 @@
+2017-05-02  Bob Duff  <duff@adacore.com>
+
+	* sem_attr.adb (Attribute_Enum_Rep): Disallow T'Enum_Rep.
+
+2017-05-02  Vasiliy Fofanov  <fofanov@adacore.com>
+
+	* s-os_lib.ads: Minor typo fix.
+
+2017-05-02  Vasiliy Fofanov  <fofanov@adacore.com>
+
+	* gnatls.adb: Merge and refactor code from Prj.Env and remove
+	this deprecated dependency.
+
+2017-05-02  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_util.ads: minor comment addition.
+
+2017-05-02  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch3.adb (Build_Derived_Record_Type): Fix a few typos and
+	pastos in part #3 of the head comment.
+
+2017-05-02  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch3.adb (Freeze_Type): Do not generate an invariant
+	procedure body for a local (sub)type declaration within a
+	predicate function. Invariant checks do not apply to these, and
+	the expansion of the procedure will happen in the wrong scope,
+	leading to misplaced freeze nodes.
+
+2017-05-02  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_util.adb (Insert_Library_Level_Action): Use proper scope
+	to analyze generated actions.  If the main unit is a body,
+	the required scope is that of the corresponding unit declaration.
+
+2017-05-02  Arnaud Charlet  <charlet@adacore.com>
+
+	* einfo.adb (Declaration_Node): flip branches of
+	an IF statement to avoid repeated negations in its condition;
+	no change in semantics, only to improve readability.
+
 2017-05-02  Arnaud Charlet  <charlet@adacore.com>
 
 	* sem_case.adb: Remove extra spaces in parameter declarations.

gcc/ada/einfo.adb

@@ -7117,15 +7117,13 @@ package body Einfo is
       end if;
 
       loop
-         if Nkind (P) /= N_Selected_Component
-           and then Nkind (P) /= N_Expanded_Name
-           and then
-             not (Nkind (P) = N_Defining_Program_Unit_Name
-                   and then Is_Child_Unit (Id))
+         if Nkind_In (P, N_Selected_Component, N_Expanded_Name)
+           or else (Nkind (P) = N_Defining_Program_Unit_Name
+                    and then Is_Child_Unit (Id))
          then
-            return P;
-         else
             P := Parent (P);
+         else
+            return P;
          end if;
       end loop;
    end Declaration_Node;

gcc/ada/exp_ch3.adb

@@ -7554,8 +7554,19 @@ package body Exp_Ch3 is
 
       --  Non-interface types
 
+      --  Do not generate invariant procedure within other assertion
+      --  subprograms, which may involve local declarations of local
+      --  subtypes to which these checks don't apply.
+
       elsif Has_Invariants (Def_Id) then
-         Build_Invariant_Procedure_Body (Def_Id);
+         if Within_Internal_Subprogram
+          or else (Ekind (Current_Scope) = E_Function
+                    and then Is_Predicate_Function (Current_Scope))
+         then
+            null;
+         else
+            Build_Invariant_Procedure_Body (Def_Id);
+         end if;
       end if;
 
       Restore_Ghost_Mode (Saved_GM);

gcc/ada/exp_util.adb

@@ -7491,8 +7491,10 @@ package body Exp_Util is
       Aux : constant Node_Id := Aux_Decls_Node (Cunit (Main_Unit));
 
    begin
-      Push_Scope (Cunit_Entity (Main_Unit));
-      --  ??? should this be Current_Sem_Unit instead of Main_Unit?
+      Push_Scope (Cunit_Entity (Current_Sem_Unit));
+      --  And not Main_Unit as previously. If the main unit is a body,
+      --  the scope needed to analyze the actions is the entity of the
+      --  corresponding declaration.
 
       if No (Actions (Aux)) then
          Set_Actions (Aux, New_List (N));

gcc/ada/exp_util.ads

@@ -1177,7 +1177,9 @@ package Exp_Util is
    function Within_Internal_Subprogram return Boolean;
    --  Indicates that some expansion is taking place within the body of a
    --  predefined primitive operation. Some expansion activity (e.g. predicate
-   --  checks) is disabled in such.
+   --  checks) is disabled in such. Because we want to detect invalid uses
+   --  of function calls within predicates (which lead to infinite recursion)
+   --  predicate functions themselves are not considered internal here.
 
 private
    pragma Inline (Duplicate_Subexpr);