diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2021-02-03 09:19:20 +0100 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-06-15 06:19:19 -0400 |
| commit | 69558e562c0605e1e13d069c3bdbadedf7d72016 (patch) | |
| tree | 520849052db7313579b961e134d7866c7f8dea3c | |
| parent | 5fdd694a74ca51b6f4fa2317c7527a1eaf1e7f57 (diff) | |
| download | gcc-69558e562c0605e1e13d069c3bdbadedf7d72016.zip gcc-69558e562c0605e1e13d069c3bdbadedf7d72016.tar.gz gcc-69558e562c0605e1e13d069c3bdbadedf7d72016.tar.bz2 | |
[Ada] Replace repeated calls by references to a local object
gcc/ada/
* sem_res.adb (Resolve_Actual): Replace repeated calls to
"Etype (F)" with references to "F_Typ", which keeps the results
of exactly that call.
| -rw-r--r-- | gcc/ada/sem_res.adb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 25badee..a570385 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -4798,11 +4798,11 @@ package body Sem_Res is -- Check illegal cases of atomic/volatile/VFA actual (RM C.6(12)) - if (Is_By_Reference_Type (Etype (F)) or else Is_Aliased (F)) + if (Is_By_Reference_Type (F_Typ) or else Is_Aliased (F)) and then Comes_From_Source (N) then if Is_Atomic_Object (A) - and then not Is_Atomic (Etype (F)) + and then not Is_Atomic (F_Typ) then Error_Msg_NE ("cannot pass atomic object to nonatomic formal&", @@ -4811,7 +4811,7 @@ package body Sem_Res is ("\which is passed by reference (RM C.6(12))", A); elsif Is_Volatile_Object_Ref (A) - and then not Is_Volatile (Etype (F)) + and then not Is_Volatile (F_Typ) then Error_Msg_NE ("cannot pass volatile object to nonvolatile formal&", @@ -4820,7 +4820,7 @@ package body Sem_Res is ("\which is passed by reference (RM C.6(12))", A); elsif Is_Volatile_Full_Access_Object_Ref (A) - and then not Is_Volatile_Full_Access (Etype (F)) + and then not Is_Volatile_Full_Access (F_Typ) then Error_Msg_NE ("cannot pass full access object to nonfull access " @@ -4855,9 +4855,9 @@ package body Sem_Res is if Is_Controlling_Formal (F) then Set_Is_Controlling_Actual (A); - if Ekind (Etype (F)) = E_Anonymous_Access_Type then + if Ekind (F_Typ) = E_Anonymous_Access_Type then declare - Desig : constant Entity_Id := Designated_Type (Etype (F)); + Desig : constant Entity_Id := Designated_Type (F_Typ); begin if Ekind (Desig) = E_Incomplete_Type and then No (Full_View (Desig)) @@ -4966,8 +4966,8 @@ package body Sem_Res is -- actual when the corresponding formal is of a non-scalar -- effectively volatile type for reading (SPARK RM 7.1.3(10)). - if not Is_Scalar_Type (Etype (F)) - and then Is_Effectively_Volatile_For_Reading (Etype (F)) + if not Is_Scalar_Type (F_Typ) + and then Is_Effectively_Volatile_For_Reading (F_Typ) then null; @@ -5088,7 +5088,7 @@ package body Sem_Res is and then Comes_From_Source (Nam) and then not Is_Primitive (Nam) - and then not Is_Class_Wide_Type (Etype (F)) + and then not Is_Class_Wide_Type (F_Typ) then Error_Msg_NE ("call to nonprimitive & with current instance not allowed " & |