[multiple changes]

2017-01-19  Javier Miranda  <miranda@adacore.com>

	* ghost.adb (Propagate_Ignored_Ghost_Code): Protect access to the
	identifier attribute of a block-statement node. Required to avoid
	assertion failure when building the new containers library.

2017-01-19  Bob Duff  <duff@adacore.com>

	* exp_ch3.adb: Update comment.

2017-01-19  Vincent Celier  <celier@adacore.com>

	* gprep.adb (Gnatprep): Parse the definition file without
	"replace in comments" even when switch -C is used.

From-SVN: r244633

gcc/ada/ChangeLog

+2017-01-19  Javier Miranda  <miranda@adacore.com>
+
+	* ghost.adb (Propagate_Ignored_Ghost_Code): Protect access to the
+	identifier attribute of a block-statement node. Required to avoid
+	assertion failure when building the new containers library.
+
+2017-01-19  Bob Duff  <duff@adacore.com>
+
+	* exp_ch3.adb: Update comment.
+
+2017-01-19  Vincent Celier  <celier@adacore.com>
+
+	* gprep.adb (Gnatprep): Parse the definition file without
+	"replace in comments" even when switch -C is used.
+
 2017-01-19  Justin Squirek  <squirek@adacore.com>
 
 	* exp_ch9.adb (Is_Pure_Barrier): Create function

gcc/ada/exp_ch3.adb

@@ -5901,7 +5901,7 @@ package body Exp_Ch3 is
          --  would otherwise make two copies. The RM allows removing redunant
          --  Adjust/Finalize calls, but does not allow insertion of extra ones.
 
-         --  This part is disabled for now, because it breaks GPS builds
+         --  This part is disabled for now, because it breaks CodePeer runs
 
          return (False -- ???
              and then Nkind (Expr_Q) = N_Explicit_Dereference

gcc/ada/ghost.adb

@@ -1490,7 +1490,9 @@ package body Ghost is
       while Present (Nod) loop
          Scop := Empty;
 
-         if Nkind (Nod) = N_Block_Statement then
+         if Nkind (Nod) = N_Block_Statement
+           and then Present (Identifier (Nod))
+         then
             Scop := Entity (Identifier (Nod));
 
          elsif Nkind_In (Nod, N_Package_Body,

gcc/ada/gprep.adb

@@ -253,7 +253,15 @@ package body GPrep is
 
             Scanner.Initialize_Scanner (Deffile);
 
-            Prep.Parse_Def_File;
+            --  Parse the definition file without "replace in comments"
+
+            declare
+               Replace : constant Boolean := Opt.Replace_In_Comments;
+            begin
+               Opt.Replace_In_Comments := False;
+               Prep.Parse_Def_File;
+               Opt.Replace_In_Comments := Replace;
+            end;
          end;
       end if;