mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-22 21:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Ada] Revert change for gnatprove that is no longer needed

Browse Source 
Years ago, we adapted Get_Kind_Of_Unit so that gnatprove could use it to
detect both bodies and specs of predefined units.

However, this wasn't really needed: gnatprove could simply reuse
Lib.In_Predefined_Unit and now it does. This patch simply reverts two
commits mentioned above.

No frontend test provided, because the removed comment is clear that this
doesn't affect the compiler. Other tools similarly should not be affected
(at least they were not when this change was introduced in 2012).

2019-08-20  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* impunit.adb (Get_Kind_Of_Unit): Revert change for adapting
	this routine for gnatprove.

From-SVN: r274718
This commit is contained in:
Piotr Trojanek 2019-08-20 09:48:02 +00:00 committed by Pierre-Marie de Rodat
parent 2beee64ae0
commit b6ad3c0844
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2019-08-20 Piotr Trojanek <trojanek@adacore.com>
* impunit.adb (Get_Kind_Of_Unit): Revert change for adapting
this routine for gnatprove.
2019-08-20 Arnaud Charlet <charlet@adacore.com>
* doc/gnat_rm/implementation_defined_pragmas.rst: Document

15
gcc/ada/impunit.adb
View File

@ -692,19 +692,10 @@ package body Impunit is
return Not_Predefined_Unit;
end if;
-- To be considered predefined, the file name must end in .ads or .adb.
-- File names with other extensions (coming from the use of non-standard
-- file naming schemes) can never be predefined.
-- Not predefined if file name does not end in .ads. This can happen
-- when non-standard file names are being used.
-- Note that in the context of a compiler, the .adb case will never
-- arise. However it can arise for other tools, e.g. gnatprove uses
-- this routine to detect when a construct comes from an instance of
-- a generic defined in a predefined unit.
if File (File'Last - 3 .. File'Last) /= ".ads"
and then
File (File'Last - 3 .. File'Last) /= ".adb"
then
if Name_Buffer (Name_Len - 3 .. Name_Len) /= ".ads" then
return Not_Predefined_Unit;
end if;