diff options
author | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2017-11-08 16:31:39 +0000 |
---|---|---|
committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2017-11-08 16:31:39 +0000 |
commit | 2cf8eabd48500b8d2480301020bd2aa82cf6556d (patch) | |
tree | c2dbb61ab4220dd6fa0227fb21a70be00dfc9bed /gcc/ada/par-util.adb | |
parent | 45a6947d0f40ca6bfebd430969087e0595c47cb8 (diff) | |
download | gcc-2cf8eabd48500b8d2480301020bd2aa82cf6556d.zip gcc-2cf8eabd48500b8d2480301020bd2aa82cf6556d.tar.gz gcc-2cf8eabd48500b8d2480301020bd2aa82cf6556d.tar.bz2 |
[multiple changes]
2017-11-08 Piotr Trojanek <trojanek@adacore.com>
* spark_xrefs.ads (SPARK_Xref_Record): Replace file and scope indices
with Entity_Id of the reference.
* spark_xrefs.adb (dspark): Adapt pretty-printing routine.
* lib-xref-spark_specific.adb (Add_SPARK_Xrefs): Store Entity_Id of the
reference, not the file and scope indices.
2017-11-08 Arnaud Charlet <charlet@adacore.com>
* errout.ads (Current_Node): New.
* errout.adb (Error_Msg): Use Current_Node.
* par-ch6.adb, par-ch7.adb, par-ch9.adb, par-util.adb: Set Current_Node
when relevant.
* style.adb: Call Error_Msg_N when possible.
From-SVN: r254543
Diffstat (limited to 'gcc/ada/par-util.adb')
-rw-r--r-- | gcc/ada/par-util.adb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ada/par-util.adb b/gcc/ada/par-util.adb index ec9a916..01b4670 100644 --- a/gcc/ada/par-util.adb +++ b/gcc/ada/par-util.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2017, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -667,6 +667,12 @@ package body Util is pragma Assert (Scope.Last > 0); Scope.Decrement_Last; + if Include_Subprogram_In_Messages + and then Scope.Table (Scope.Last).Labl /= Error + then + Current_Node := Scope.Table (Scope.Last).Labl; + end if; + if Debug_Flag_P then Error_Msg_Uint_1 := UI_From_Int (Scope.Last); Error_Msg_SC ("decrement scope stack ptr, new value = ^!"); |