aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2023-07-10 15:02:43 +0200
committerMarc Poulhiès <poulhies@adacore.com>2023-07-28 09:28:13 +0200
commit39e183a6780e4f62ac356198ec8f72a817693b89 (patch)
tree92701a1cd634e32ddef0e599a7bb039e6c627a90
parent5d8fc02062b36e58c9d0bd39e7c9bb286335d870 (diff)
downloadgcc-39e183a6780e4f62ac356198ec8f72a817693b89.zip
gcc-39e183a6780e4f62ac356198ec8f72a817693b89.tar.gz
gcc-39e183a6780e4f62ac356198ec8f72a817693b89.tar.bz2
ada: Leave detection of missing return in functions to GNATprove
GNAT has a heuristic to warn about missing return statements in functions. This warning was escalated to errors when operating in GNATprove mode and SPARK_Mode was On. However, this heuristic was imprecise and caused spurious errors. Also, it was applied after the Push_Scope/End_Scope, so for functions acting as compilation units it was using the wrong SPARK_Mode. It is better to simply leave this detection to GNATprove. gcc/ada/ * sem_ch6.adb (Check_Statement_Sequence): Only warn about missing return statements and let GNATprove emit a check when needed.
-rw-r--r--gcc/ada/sem_ch6.adb11
1 files changed, 2 insertions, 9 deletions
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 62ca985..4e64833 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -7315,18 +7315,11 @@ package body Sem_Ch6 is
-- already, so the Assert_False is for the assertions off case.
if not Raise_Exception_Call and then not Assert_False then
-
- -- In GNATprove mode, it is an error to have a missing return
-
- Error_Msg_Warn := SPARK_Mode /= On;
-
- -- Issue error message or warning
-
Error_Msg_N
- ("RETURN statement missing following this statement<<!",
+ ("RETURN statement missing following this statement??!",
Last_Stm);
Error_Msg_N
- ("\Program_Error [<<!", Last_Stm);
+ ("\Program_Error [??!", Last_Stm);
end if;
-- Note: we set Err even though we have not issued a warning