Commit b6ad3c08 by Piotr Trojanek Committed by Pierre-Marie de Rodat

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

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
parent 2beee64a
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> 2019-08-20 Arnaud Charlet <charlet@adacore.com>
* doc/gnat_rm/implementation_defined_pragmas.rst: Document * doc/gnat_rm/implementation_defined_pragmas.rst: Document
......
...@@ -692,19 +692,10 @@ package body Impunit is ...@@ -692,19 +692,10 @@ package body Impunit is
return Not_Predefined_Unit; return Not_Predefined_Unit;
end if; end if;
-- To be considered predefined, the file name must end in .ads or .adb. -- Not predefined if file name does not end in .ads. This can happen
-- File names with other extensions (coming from the use of non-standard -- when non-standard file names are being used.
-- file naming schemes) can never be predefined.
if Name_Buffer (Name_Len - 3 .. Name_Len) /= ".ads" then
-- 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
return Not_Predefined_Unit; return Not_Predefined_Unit;
end if; end if;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment