aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2018-05-25 09:04:09 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2018-05-25 09:04:09 +0000
commit308ac7f401cc93a8464f5c3cf415e4cc4552c12e (patch)
treed4a997dc18a765d4a88d957b65540875ee34ff3d
parent9ea43db62e4060461a01f116646ffcf3e87c15fb (diff)
downloadgcc-308ac7f401cc93a8464f5c3cf415e4cc4552c12e.zip
gcc-308ac7f401cc93a8464f5c3cf415e4cc4552c12e.tar.gz
gcc-308ac7f401cc93a8464f5c3cf415e4cc4552c12e.tar.bz2
[Ada] Fix convention for iteration with multiple loop variables
Refactoring based on suggestions from GNAT frontend developers. Semantics unaffected. 2018-05-25 Piotr Trojanek <trojanek@adacore.com> gcc/ada/ * sem_util.adb (Iterate_Call_Parameters): Fix code convention and assertions. From-SVN: r260728
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/sem_util.adb5
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a24c898..5596c59 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-25 Piotr Trojanek <trojanek@adacore.com>
+
+ * sem_util.adb (Iterate_Call_Parameters): Fix code convention and
+ assertions.
+
2018-05-25 Hristian Kirtchev <kirtchev@adacore.com>
* einfo.adb, einfo.ads, exp_ch3.adb, exp_ch8.adb, exp_unst.adb,
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 81a056e..00b7cfb 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -17882,13 +17882,14 @@ package body Sem_Util is
Formal : Entity_Id := First_Formal (Get_Called_Entity (Call));
begin
- while Present (Formal) loop
- pragma Assert (Present (Formal));
+ while Present (Formal) and then Present (Actual) loop
Handle_Parameter (Formal, Actual);
+
Next_Formal (Formal);
Next_Actual (Actual);
end loop;
+ pragma Assert (No (Formal));
pragma Assert (No (Actual));
end Iterate_Call_Parameters;