summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwij <wijiler@gmail.com>2025-01-14 13:07:16 -0500
committerGitHub <noreply@github.com>2025-01-14 10:07:16 -0800
commit971996b397711016d47fe961890d7001338c6f23 (patch)
tree3fe3dc39bd3c311415aff7861947729d997d7416
parentd98e3f3281378c134d643cc3dd28ba3ca031a349 (diff)
Fix #5354, change diagnostic definition error message and expect output in test (#6067)
Co-authored-by: Yong He <yonghe@outlook.com>
-rw-r--r--source/slang/slang-diagnostic-defs.h2
-rw-r--r--tests/diagnostics/missing-return.slang.expected4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/slang/slang-diagnostic-defs.h b/source/slang/slang-diagnostic-defs.h
index 821a895bc..1d09189cc 100644
--- a/source/slang/slang-diagnostic-defs.h
+++ b/source/slang/slang-diagnostic-defs.h
@@ -2060,7 +2060,7 @@ DIAGNOSTIC(
DIAGNOSTIC(41000, Warning, unreachableCode, "unreachable code detected")
DIAGNOSTIC(41001, Error, recursiveType, "type '$0' contains cyclic reference to itself.")
-DIAGNOSTIC(41010, Warning, missingReturn, "control flow may reach end of non-'void' function")
+DIAGNOSTIC(41010, Warning, missingReturn, "non-void function does not return in all cases")
DIAGNOSTIC(
41011,
Error,
diff --git a/tests/diagnostics/missing-return.slang.expected b/tests/diagnostics/missing-return.slang.expected
index e41e756ff..762666524 100644
--- a/tests/diagnostics/missing-return.slang.expected
+++ b/tests/diagnostics/missing-return.slang.expected
@@ -1,9 +1,9 @@
result code = 0
standard error = {
-tests/diagnostics/missing-return.slang(7): warning 41010: control flow may reach end of non-'void' function
+tests/diagnostics/missing-return.slang(7): warning 41010: non-void function does not return in all cases
int bad(int a, int b)
^~~
-tests/diagnostics/missing-return.slang(14): warning 41010: control flow may reach end of non-'void' function
+tests/diagnostics/missing-return.slang(14): warning 41010: non-void function does not return in all cases
int alsoBad(int a, int b)
^~~~~~~
}