lib-xref.ads, [...] (Traverse_Declarations): Remove Inside_Stubs parameter.

2017-11-08  Piotr Trojanek  <trojanek@adacore.com>

	* lib-xref.ads, lib-xref-spark_specific.adb (Traverse_Declarations):
	Remove Inside_Stubs parameter.

From-SVN: r254540

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6b1d7cab580a552896fe2a9bd11992839e7d4c1c..1a4a58281f8fbe41156248b1a303491088df0d08 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-08  Piotr Trojanek  <trojanek@adacore.com>
+
+       * lib-xref.ads, lib-xref-spark_specific.adb (Traverse_Declarations):
+       Remove Inside_Stubs parameter.
+
 2017-11-08  Piotr Trojanek  <trojanek@adacore.com>
 
        * spark_xrefs.ads (SPARK_Xref_Record): Referenced object is now

diff --git a/gcc/ada/lib-xref-spark_specific.adb b/gcc/ada/lib-xref-spark_specific.adb
index 1b31c6acd1114faebc3e6345123af5060e86d19d..c43cbb15cede0a5de9f31fa0189068ac18a830f2 100644 (file)
--- a/gcc/ada/lib-xref-spark_specific.adb
+++ b/gcc/ada/lib-xref-spark_specific.adb
@@ -230,14 +230,14 @@ package body SPARK_Specific is
          return;
       end if;
 
-      Traverse_Scopes (CU => Cunit (Uspec), Inside_Stubs => True);
+      Traverse_Scopes (CU => Cunit (Uspec));
 
       --  When two units are present for the same compilation unit, as it
       --  happens for library-level instantiations of generics, then add all
       --  scopes to the same SPARK file.
 
       if Ubody /= No_Unit then
-         Traverse_Scopes (CU => Cunit (Ubody), Inside_Stubs => True);
+         Traverse_Scopes (CU => Cunit (Ubody));
       end if;
 
       --  Make entry for new file in file table
@@ -1156,10 +1156,7 @@ package body SPARK_Specific is
    -- Traverse_Compilation_Unit --
    -------------------------------
 
-   procedure Traverse_Compilation_Unit
-     (CU           : Node_Id;
-      Inside_Stubs : Boolean)
-   is
+   procedure Traverse_Compilation_Unit (CU : Node_Id) is
       procedure Traverse_Block                      (N : Node_Id);
       procedure Traverse_Declaration_Or_Statement   (N : Node_Id);
       procedure Traverse_Declarations_And_HSS       (N : Node_Id);
@@ -1195,7 +1192,7 @@ package body SPARK_Specific is
                                         N_Subprogram_Body_Stub,
                                         N_Task_Body_Stub));
 
-            return Inside_Stubs and then Present (Library_Unit (N));
+            return Present (Library_Unit (N));
          end Traverse_Stub;
 
       --  Start of processing for Traverse_Declaration_Or_Statement

diff --git a/gcc/ada/lib-xref.ads b/gcc/ada/lib-xref.ads
index f827eb449796acf87ea81369fb2240360de4b4c6..85b42efe08467baa41534c0c3b3a44d74a684316 100644 (file)
--- a/gcc/ada/lib-xref.ads
+++ b/gcc/ada/lib-xref.ads
@@ -647,12 +647,9 @@ package Lib.Xref is
 
       generic
          with procedure Process (N : Node_Id) is <>;
-      procedure Traverse_Compilation_Unit
-        (CU           : Node_Id;
-         Inside_Stubs : Boolean);
-      --  Call Process on all declarations within compilation unit CU. If
-      --  Inside_Stubs is True, then the body of stubs is also traversed.
-      --  Generic declarations are ignored.
+      procedure Traverse_Compilation_Unit (CU : Node_Id);
+      --  Call Process on all declarations within compilation unit CU. Bodies
+      --  of stubs are also traversed, but generic declarations are ignored.
 
    end SPARK_Specific;