[Ada] Simplify routines with a local Result variable

Local variable Result that is modified inside IF statements makes a seemingly
trivial code slightly hard to understand. This patch rewrites such a pattern.

Semantics unaffected.

2018-05-24  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* sem_elab.adb (Non_Private_View): Simplify by removing a local Result
	variable.
	* sem_prag.adb (Get_Base_Subprogram): Same as above.

From-SVN: r260670

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 5ebe69e4de6f7cca188f6aa1a91e64a88a66f1a1..66dfa8e747178f3627200c8a35b9b1ce75e75f75 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-24  Piotr Trojanek  <trojanek@adacore.com>
+
+       * sem_elab.adb (Non_Private_View): Simplify by removing a local Result
+       variable.
+       * sem_prag.adb (Get_Base_Subprogram): Same as above.
+
 2018-05-24  Eric Botcazou  <ebotcazou@adacore.com>
 
        * fe.h (Set_Normalized_First_Bit): Declare.

diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb
index 9525f7f6f23aede44efbc0dc8efdf0e28fc4f8f9..e3169952803cd52bb7ca0245cd0c16726f4d8578 100644 (file)
--- a/gcc/ada/sem_elab.adb
+++ b/gcc/ada/sem_elab.adb
@@ -8077,16 +8077,12 @@ package body Sem_Elab is
    ----------------------
 
    function Non_Private_View (Typ : Entity_Id) return Entity_Id is
-      Result : Entity_Id;
-
    begin
-      Result := Typ;
-
-      if Is_Private_Type (Result) and then Present (Full_View (Result)) then
-         Result := Full_View (Result);
+      if Is_Private_Type (Typ) and then Present (Full_View (Typ)) then
+         return Full_View (Typ);
+      else
+         return Typ;
       end if;
-
-      return Result;
    end Non_Private_View;
 
    -----------------------------

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index c85d26f6c43d72ddb533e4e19b1eb5b8e0783291..cd46404cf8e04917922be548e63d942ea5673528 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -29765,23 +29765,19 @@ package body Sem_Prag is
    -------------------------
 
    function Get_Base_Subprogram (Def_Id : Entity_Id) return Entity_Id is
-      Result : Entity_Id;
-
    begin
       --  Follow subprogram renaming chain
 
-      Result := Def_Id;
-
-      if Is_Subprogram (Result)
+      if Is_Subprogram (Def_Id)
         and then
-          Nkind (Parent (Declaration_Node (Result))) =
+          Nkind (Parent (Declaration_Node (Def_Id))) =
                                          N_Subprogram_Renaming_Declaration
-        and then Present (Alias (Result))
+        and then Present (Alias (Def_Id))
       then
-         Result := Alias (Result);
+         return Alias (Def_Id);
+      else
+         return Def_Id;
       end if;
-
-      return Result;
    end Get_Base_Subprogram;
 
    -----------------------