From 7c323fbe3bdff58d4081e4706d24c17f4bb36f8a Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 19 Jan 2017 14:13:19 +0100 Subject: [multiple changes] 2017-01-19 Javier Miranda * 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 * exp_ch3.adb: Update comment. 2017-01-19 Vincent Celier * gprep.adb (Gnatprep): Parse the definition file without "replace in comments" even when switch -C is used. From-SVN: r244633 --- gcc/ada/ghost.adb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gcc/ada/ghost.adb') diff --git a/gcc/ada/ghost.adb b/gcc/ada/ghost.adb index b55cff6..fadb891 100644 --- a/gcc/ada/ghost.adb +++ b/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, -- cgit v1.1