From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 8 Nov 2017 16:16:04 +0000 (+0000)
Subject: lib-xref.ads, [...] (Traverse_Declarations): Remove Inside_Stubs parameter.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=784ef0fb7cd3e6bdf8cdba51a14cd884f365cb59;p=gcc.git

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 6b1d7cab580..1a4a58281f8 100644
--- 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 1b31c6acd11..c43cbb15ced 100644
--- 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 f827eb44979..85b42efe084 100644
--- 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;