[Ada] Disable special handling for preconditions specified by pragmas

2018-09-26  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* contracts.adb (Analyze_Entry_Or_Subprogram_Contract): The
	analysis of preconditions specified by pragmas (rather than
	aspects) is not delayed, and therefore expressions functions
	that are completions do not need special handling during
	expansion.

From-SVN: r264604

gcc/ada/ChangeLog

 2018-09-26  Ed Schonberg  <schonberg@adacore.com>
 
+	* contracts.adb (Analyze_Entry_Or_Subprogram_Contract): The
+	analysis of preconditions specified by pragmas (rather than
+	aspects) is not delayed, and therefore expressions functions
+	that are completions do not need special handling during
+	expansion.
+
+2018-09-26  Ed Schonberg  <schonberg@adacore.com>
+
 	* exp_unst.adb: Fix handling of up level references for entries.
 
 2018-09-26  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/contracts.adb

@@ -620,7 +620,9 @@ package body Contracts is
 
                Prag := Pre_Post_Conditions (Items);
                while Present (Prag) loop
-                  if Freeze_Types then
+                  if Freeze_Types
+                    and then Present (Corresponding_Aspect (Prag))
+                  then
                      Freeze_Expr_Types
                        (Def_Id => Subp_Id,
                         Typ    => Standard_Boolean,