[Ada] Minor refactoring

2019-07-11  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* checks.adb: Fix typo in comment.
	* sem.adb (Semantics): Avoid repeated calls to
	In_Extended_Main_Source_Unit by reusing an already-cached
	result.
	* sem_util.adb (First_Global): Fix style.

From-SVN: r273406

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 59f20c489e5f2162f6a6d94326fca1a442dd2bfc..e3fd0a1ee47603640e357782f43329eb3650699c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2019-07-11  Piotr Trojanek  <trojanek@adacore.com>
+
+       * checks.adb: Fix typo in comment.
+       * sem.adb (Semantics): Avoid repeated calls to
+       In_Extended_Main_Source_Unit by reusing an already-cached
+       result.
+       * sem_util.adb (First_Global): Fix style.
+
 2019-07-11  Yannick Moy  <moy@adacore.com>
 
        * sem_res.adb (Resolve_Call): Do not perform dimensionality

diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb
index 984bb159f814bd47eecdd238fe7f58b5d8f2682b..73f7edc08a9bece080ce2b81b9ec941c2d340235 100644 (file)
--- a/gcc/ada/checks.adb
+++ b/gcc/ada/checks.adb
@@ -7056,7 +7056,7 @@ package body Checks is
             Convert_And_Check_Range;
          end if;
 
-      --  Note that at this stage we now that the Target_Base_Type is not in
+      --  Note that at this stage we know that the Target_Base_Type is not in
       --  the range of the Source_Base_Type (since even the Target_Type itself
       --  is not in this range). It could still be the case that Source_Type is
       --  in range of the target base type since we have not checked that case.

diff --git a/gcc/ada/sem.adb b/gcc/ada/sem.adb
index fa3ed481330abc4af0580344abe35e5405b5159f..2f8f6a4eee490618cb3bd0799ec57a68ca27576d 100644 (file)
--- a/gcc/ada/sem.adb
+++ b/gcc/ada/sem.adb
@@ -1579,7 +1579,7 @@ package body Sem is
            and then Nkind (Unit (Comp_Unit)) in N_Proper_Body
            and then (Nkind (Unit (Comp_Unit)) /= N_Subprogram_Body
                        or else not Acts_As_Spec (Comp_Unit))
-           and then not In_Extended_Main_Source_Unit (Comp_Unit)
+           and then not Ext_Main_Source_Unit
          then
             null;
 

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 04d981a6a86a2220cc49cba73f82b1904da239d3..f18eb0fb9a9c1e386cbd6522c4310512deaf667b 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -8703,6 +8703,8 @@ package body Sem_Util is
       Global  : Node_Id := Empty;
       Body_Id : Entity_Id;
 
+   --  Start of processing for First_Global
+
    begin
       pragma Assert (Nam_In (Global_Mode, Name_In_Out,
                                           Name_Input,